On Tuesday 11 April 2017 03:43 AM, Adam Ford wrote:
The previous version of omap3_logic_defconfig supported either Torpedo or SOM-LV. Now with the device tree, there are two different defconfig files:
omap3_logic_defconfig = torpedo omap3_logic_somlv_defconfig = SOM-LV
This patch also removes all the excessive code in trying to determine the differences between these boards as well as removing the some of the unnecessary NS16550 intiailization as the device tree can do that now. This also adds DM_I2C and DM_MMC since the overlying drivers have the built-in support already. The corresponding include/config/omap3_logic.h also reduced in size due to the new device tree support.
This could be a separate patch. Otherwise
Reviewed-by: Lokesh Vutla lokeshvutla@ti.com
Thanks and regards, Lokesh
The device trees were sync'd with 4.9.y stable with two changes: disable mmc2 and stdout-path = &uart1. Both of those two changes will be submitted to the linux-omap list.
Signed-off-by: Adam Ford aford173@gmail.com
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7378c88..44c586d 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -341,6 +341,10 @@ dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \ keystone-k2e-evm.dtb \ keystone-k2g-evm.dtb
+dtb-$(CONFIG_TARGET_OMAP3_LOGIC) += \
- logicpd-torpedo-37xx-devkit.dtb \
- logicpd-som-lv-37xx-devkit.dts
dtb-$(CONFIG_TARGET_SAMA5D2_XPLAINED) += \ at91-sama5d2_xplained.dtb
diff --git a/arch/arm/dts/logicpd-som-lv-37xx-devkit.dts b/arch/arm/dts/logicpd-som-lv-37xx-devkit.dts new file mode 100644 index 0000000..31ecfdc --- /dev/null +++ b/arch/arm/dts/logicpd-som-lv-37xx-devkit.dts @@ -0,0 +1,271 @@ +/*
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
- */
+/dts-v1/;
+#include "omap36xx.dtsi" +#include "logicpd-som-lv.dtsi" +#include "omap-gpmc-smsc9221.dtsi"
+/ {
- model = "LogicPD Zoom DM3730 SOM-LV Development Kit";
- compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3630", "ti,omap3";
- chosen {
stdout-path = &uart1;- };
- gpio_keys {
compatible = "gpio-keys";pinctrl-names = "default";pinctrl-0 = <&gpio_key_pins>;sysboot2 {label = "gpio3";gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* gpio_111 / uP_GPIO_3 */linux,code = <BTN_0>;wakeup-source;};- };
- sound {
compatible = "ti,omap-twl4030";ti,model = "omap3logic";ti,mcbsp = <&mcbsp2>;- };
- leds {
compatible = "gpio-leds";pinctrl-names = "default";pinctrl-0 = <&led_pins &led_pins_wkup>;led1 {label = "led1";gpios = <&gpio5 5 GPIO_ACTIVE_LOW>; /* gpio133 */linux,default-trigger = "cpu0";};led2 {label = "led2";gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* gpio11 */linux,default-trigger = "none";};- };
+};
+&vaux1 {
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
+};
+&vaux4 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
+};
+&mcbsp2 {
- status = "okay";
+};
+&charger {
- ti,bb-uvolt = <3200000>;
- ti,bb-uamp = <150>;
+};
+&gpmc {
- ranges = <1 0 0x08000000 0x1000000>; /* CS1: 16MB for LAN9221 */
- ethernet@gpmc {
pinctrl-names = "default";pinctrl-0 = <&lan9221_pins>;interrupt-parent = <&gpio5>;interrupts = <24 IRQ_TYPE_LEVEL_LOW>; /* gpio_152 */reg = <1 0 0xff>;- };
+};
+&vpll2 {
- regulator-always-on;
+};
+&dss {
- status = "ok";
- vdds_dsi-supply = <&vpll2>;
- vdda_video-supply = <&video_reg>;
- pinctrl-names = "default";
- pinctrl-0 = <&dss_dpi_pins1>;
- port {
dpi_out: endpoint {remote-endpoint = <&lcd_in>;data-lines = <16>;};- };
+};
+/ {
- aliases {
display0 = &lcd0;- };
- video_reg: video_reg {
compatible = "regulator-fixed";regulator-name = "fixed-supply";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;- };
- lcd0: display@0 {
compatible = "panel-dpi";label = "28";status = "okay";/* default-on; */pinctrl-names = "default";pinctrl-0 = <&lcd_enable_pin>;enable-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>; /* gpio155, lcd INI */port {lcd_in: endpoint {remote-endpoint = <&dpi_out>;};};panel-timing {clock-frequency = <9000000>;hactive = <480>;vactive = <272>;hfront-porch = <3>;hback-porch = <2>;hsync-len = <42>;vback-porch = <3>;vfront-porch = <2>;vsync-len = <11>;hsync-active = <1>;vsync-active = <1>;de-active = <1>;pixelclk-active = <0>;};- };
- bl: backlight {
compatible = "pwm-backlight";pinctrl-names = "default";pinctrl-0 = <&backlight_pins>;pwms = <&twl_pwm 0 5000000>;brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;default-brightness-level = <7>;enable-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; /* gpio_8 */- };
+};
+&mmc1 {
- interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
- pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins>;
- wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */
- cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>; /* gpio_110 */
- vmmc-supply = <&vmmc1>;
- bus-width = <4>;
- cap-power-off-card;
+};
+&mmc2 {
- status = "disabled";
+};
+&omap3_pmx_core {
- gpio_key_pins: pinmux_gpio_key_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x212e, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_xclkb.gpio_111 / uP_GPIO_3*/>;- };
- led_pins: pinmux_led_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x215e, PIN_OUTPUT_PULLUP | MUX_MODE4) /* sdmmc2_dat1.gpio_133 / uP_GPIO_0 */>;- };
- lan9221_pins: pinmux_lan9221_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4) /* mcbsp4_clkx.gpio_152 */>;- };
- mmc1_pins: pinmux_mmc1_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x2144, PIN_OUTPUT | MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT | MUX_MODE0) /* sdmmc1_cmd.sdmmc1_cmd */OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat0.sdmmc1_dat0 */OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_strobe.gpio_126 */OMAP3_CORE1_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_d11.gpio_110 */>;- };
- lcd_enable_pin: pinmux_lcd_enable_pin {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x218a, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4) /* mcbsp4_fs.gpio_155 */>;- };
- dss_dpi_pins1: pinmux_dss_dpi_pins1 {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_pclk.dss_pclk */OMAP3_CORE1_IOPAD(0x20d6, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_hsync.dss_hsync */OMAP3_CORE1_IOPAD(0x20d8, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_vsync.dss_vsync */OMAP3_CORE1_IOPAD(0x20da, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_acbias.dss_acbias */OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data0.dss_data0 */OMAP3_CORE1_IOPAD(0x20de, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data1.dss_data1 */OMAP3_CORE1_IOPAD(0x20e0, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data2.dss_data2 */OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data3.dss_data3 */OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data4.dss_data4 */OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data5.dss_data5 */OMAP3_CORE1_IOPAD(0x20e8, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data6.dss_data6 */OMAP3_CORE1_IOPAD(0x20ea, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data7.dss_data7 */OMAP3_CORE1_IOPAD(0x20ec, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data8.dss_data8 */OMAP3_CORE1_IOPAD(0x20ee, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data9.dss_data9 */OMAP3_CORE1_IOPAD(0x20f0, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data10.dss_data10 */OMAP3_CORE1_IOPAD(0x20f2, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data11.dss_data11 */OMAP3_CORE1_IOPAD(0x20f4, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data12.dss_data12 */OMAP3_CORE1_IOPAD(0x20f6, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data13.dss_data13 */OMAP3_CORE1_IOPAD(0x20f8, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data14.dss_data14 */OMAP3_CORE1_IOPAD(0x20fa, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data15.dss_data15 */>;- };
+};
+&omap3_pmx_wkup {
- led_pins_wkup: pinmux_led_pins_wkup {
pinctrl-single,pins = <OMAP3_WKUP_IOPAD(0x2a24, PIN_OUTPUT_PULLUP | MUX_MODE4) /* jtag_emu0.gpio_11 / uP_GPIO_1 */>;- };
- backlight_pins: pinmux_backlight_pins {
pinctrl-single,pins = <OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4) /* sys_boot6.gpio_8 */>;- };
+};
+&uart1 {
- interrupts-extended = <&intc 72 &omap3_pmx_core OMAP3_UART1_RX>;
+};
+/* Wired to the tps65950 on the SOM, only the USB connector is on the devkit */ +&usb_otg_hs {
- pinctrl-names = "default";
- pinctrl-0 = <&hsusb_otg_pins>;
- interface-type = <0>;
- usb-phy = <&usb2_phy>;
- phys = <&usb2_phy>;
- phy-names = "usb2-phy";
- mode = <3>;
- power = <50>;
+}; diff --git a/arch/arm/dts/logicpd-som-lv.dtsi b/arch/arm/dts/logicpd-som-lv.dtsi new file mode 100644 index 0000000..46dae55 --- /dev/null +++ b/arch/arm/dts/logicpd-som-lv.dtsi @@ -0,0 +1,271 @@ +/*
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
- */
+#include <dt-bindings/input/input.h>
+/ {
- cpus {
cpu@0 {cpu0-supply = <&vcc>;};- };
- memory@80000000 {
device_type = "memory";reg = <0x80000000 0>;- };
- wl12xx_vmmc: wl12xx_vmmc {
compatible = "regulator-fixed";regulator-name = "vwl1271";regulator-min-microvolt = <1800000>;regulator-max-microvolt = <1800000>;gpio = <&gpio1 3 0>; /* gpio_3 */startup-delay-us = <70000>;enable-active-high;vin-supply = <&vmmc2>;- };
- /* HS USB Host PHY on PORT 1 */
- hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; /* gpio_4 */- };
+};
+&gpmc {
- ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */
- nand@0,0 {
compatible = "ti,omap2-nand";reg = <0 0 4>; /* CS0, offset 0, IO size 4 */interrupt-parent = <&gpmc>;interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */<1 IRQ_TYPE_NONE>; /* termcount */linux,mtd-name = "micron,mt29f4g16abbda3w";nand-bus-width = <16>;ti,nand-ecc-opt = "bch8";rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */gpmc,sync-clk-ps = <0>;gpmc,cs-on-ns = <0>;gpmc,cs-rd-off-ns = <44>;gpmc,cs-wr-off-ns = <44>;gpmc,adv-on-ns = <6>;gpmc,adv-rd-off-ns = <34>;gpmc,adv-wr-off-ns = <44>;gpmc,we-off-ns = <40>;gpmc,oe-off-ns = <54>;gpmc,access-ns = <64>;gpmc,rd-cycle-ns = <82>;gpmc,wr-cycle-ns = <82>;gpmc,wr-access-ns = <40>;gpmc,wr-data-mux-bus-ns = <0>;gpmc,device-width = <2>;#address-cells = <1>;#size-cells = <1>;/* u-boot uses mtdparts=omap2-nand.0:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs) */x-loader@0 {label = "x-loader";reg = <0 0x80000>;};bootloaders@80000 {label = "u-boot";reg = <0x80000 0x1e0000>;};bootloaders_env@260000 {label = "u-boot-env";reg = <0x260000 0x20000>;};kernel@280000 {label = "kernel";reg = <0x280000 0x400000>;};filesystem@680000 {label = "fs";reg = <0x680000 0>; /* 0 = MTDPART_SIZ_FULL */};- };
+};
+&i2c1 {
- clock-frequency = <400000>;
- twl: twl@48 {
reg = <0x48>;interrupts = <7>; /* SYS_NIRQ cascaded to intc */interrupt-parent = <&intc>;twl_audio: audio {compatible = "ti,twl4030-audio";codec {};};- };
+};
+&i2c2 {
- clock-frequency = <400000>;
+};
+&i2c3 {
- clock-frequency = <400000>;
+};
+&mmc3 {
- interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
- pinctrl-0 = <&mmc3_pins>;
- pinctrl-names = "default";
- vmmc-supply = <&wl12xx_vmmc>;
- non-removable;
- bus-width = <4>;
- cap-power-off-card;
- #address-cells = <1>;
- #size-cells = <0>;
- wlcore: wlcore@2 {
compatible = "ti,wl1273";reg = <2>;interrupt-parent = <&gpio5>;interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; /* gpio 152 */ref-clock-frequency = <26000000>;- };
+};
+&usbhshost {
- port2-mode = "ehci-phy";
+};
+&usbhsehci {
- phys = <0 &hsusb2_phy>;
+};
+&omap3_pmx_core {
- pinctrl-names = "default";
- pinctrl-0 = <&hsusb2_pins>;
- mmc3_pins: pinmux_mm3_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x2164, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat4.sdmmc3_dat0 */OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat5.sdmmc3_dat1 */OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat2 */OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat3 */OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4) /* mcbsp4_clkx.gpio_152 */OMAP3_CORE1_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */OMAP3_CORE1_IOPAD(0x21d0, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs1.sdmmc3_cmd */OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs2.sdmmc_clk */>;- };
- mcbsp2_pins: pinmux_mcbsp2_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0) /* mcbsp2_fsx */OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0) /* mcbsp2_clkx */OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0) /* mcbsp2_dr */OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0) /* mcbsp2_dx */>;- };
- uart2_pins: pinmux_uart2_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT | MUX_MODE0) /* uart2_cts.uart2_cts */OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0) /* uart2_rts .uart2_rts*/OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */OMAP3_CORE1_IOPAD(0x2198, PIN_OUTPUT | MUX_MODE4) /* GPIO_162,BT_EN */>;- };
- mcspi1_pins: pinmux_mcspi1_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x21c8, PIN_INPUT | MUX_MODE0) /* mcspi1_clk.mcspi1_clk */OMAP3_CORE1_IOPAD(0x21ca, PIN_OUTPUT | MUX_MODE0) /* mcspi1_simo.mcspi1_simo */OMAP3_CORE1_IOPAD(0x21cc, PIN_INPUT_PULLUP | MUX_MODE0) /* mcspi1_somi.mcspi1_somi */OMAP3_CORE1_IOPAD(0x21ce, PIN_OUTPUT | MUX_MODE0) /* mcspi1_cs0.mcspi1_cs0 */>;- };
- hsusb2_pins: pinmux_hsusb2_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x21d4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi1_cs3.hsusb2_data2 */OMAP3_CORE1_IOPAD(0x21d6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_clk.hsusb2_data7 */OMAP3_CORE1_IOPAD(0x21d8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_simo.hsusb2_data4 */OMAP3_CORE1_IOPAD(0x21da, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_somi.hsusb2_data5 */OMAP3_CORE1_IOPAD(0x21dc, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_cs0.hsusb2_data6 */OMAP3_CORE1_IOPAD(0x21de, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_cs1.hsusb2_data3 */>;- };
- hsusb_otg_pins: pinmux_hsusb_otg_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x21a2, PIN_INPUT | MUX_MODE0) /* hsusb0_clk.hsusb0_clk */OMAP3_CORE1_IOPAD(0x21a4, PIN_OUTPUT | MUX_MODE0) /* hsusb0_stp.hsusb0_stp */OMAP3_CORE1_IOPAD(0x21a6, PIN_INPUT | MUX_MODE0) /* hsusb0_dir.hsusb0_dir */OMAP3_CORE1_IOPAD(0x21a8, PIN_INPUT | MUX_MODE0) /* hsusb0_nxt.hsusb0_nxt */OMAP3_CORE1_IOPAD(0x21aa, PIN_INPUT | MUX_MODE0) /* hsusb0_data0.hsusb0_data0 */OMAP3_CORE1_IOPAD(0x21ac, PIN_INPUT | MUX_MODE0) /* hsusb0_data1.hsusb0_data1 */OMAP3_CORE1_IOPAD(0x21ae, PIN_INPUT | MUX_MODE0) /* hsusb0_data2.hsusb0_data2 */OMAP3_CORE1_IOPAD(0x21b0, PIN_INPUT | MUX_MODE0) /* hsusb0_data3.hsusb0_data3 */OMAP3_CORE1_IOPAD(0x21b2, PIN_INPUT | MUX_MODE0) /* hsusb0_data4.hsusb0_data4 */OMAP3_CORE1_IOPAD(0x21b4, PIN_INPUT | MUX_MODE0) /* hsusb0_data5.hsusb0_data5 */OMAP3_CORE1_IOPAD(0x21b6, PIN_INPUT | MUX_MODE0) /* hsusb0_data6.hsusb0_data6 */OMAP3_CORE1_IOPAD(0x21b8, PIN_INPUT | MUX_MODE0) /* hsusb0_data7.hsusb0_data7 */>;- };
+};
+&omap3_pmx_wkup {
- pinctrl-names = "default";
- pinctrl-0 = <&hsusb2_reset_pin>;
- hsusb2_reset_pin: pinmux_hsusb1_reset_pin {
pinctrl-single,pins = <OMAP3_WKUP_IOPAD(0x2a0e, PIN_OUTPUT | MUX_MODE4) /* sys_boot2.gpio_4 */>;- };
+};
+&omap3_pmx_core2 {
- pinctrl-names = "default";
- pinctrl-0 = <&hsusb2_2_pins>;
- hsusb2_2_pins: pinmux_hsusb2_2_pins {
pinctrl-single,pins = <OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d12.hsusb2_dir */OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d14.hsusb2_data0 */OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d15.hsusb2_data1 */>;- };
+};
+&uart2 {
- interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>;
- pinctrl-names = "default";
- pinctrl-0 = <&uart2_pins>;
+};
+&mcspi1 {
- pinctrl-names = "default";
- pinctrl-0 = <&mcspi1_pins>;
+};
+#include "twl4030.dtsi" +#include "twl4030_omap3.dtsi"
+&twl {
- twl_power: power {
compatible = "ti,twl4030-power-idle-osc-off", "ti,twl4030-power-idle";ti,use_poweroff;- };
+};
+&twl_gpio {
- ti,use-leds;
+}; diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts new file mode 100644 index 0000000..b6838ce --- /dev/null +++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts @@ -0,0 +1,412 @@ +/*
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
- */
+/dts-v1/;
+#include "omap36xx.dtsi" +#include "logicpd-torpedo-som.dtsi" +#include "omap-gpmc-smsc9221.dtsi"
+/ {
- model = "LogicPD Zoom DM3730 Torpedo + Wireless Development Kit";
- compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3";
- chosen {
stdout-path = &uart1;- };
- gpio_keys {
compatible = "gpio-keys";pinctrl-names = "default";pinctrl-0 = <&gpio_key_pins &gpio_key_pins_wkup>;sysboot2 {label = "sysboot2";gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; /* gpio2 */linux,code = <BTN_0>;wakeup-source;};sysboot5 {label = "sysboot5";gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; /* gpio7 */linux,code = <BTN_1>;wakeup-source;};gpio1 {label = "gpio1";gpios = <&gpio6 21 GPIO_ACTIVE_LOW>; /* gpio181 */linux,code = <BTN_2>;wakeup-source;};gpio2 {label = "gpio2";gpios = <&gpio6 18 GPIO_ACTIVE_LOW>; /* gpio178 */linux,code = <BTN_3>;wakeup-source;};- };
- sound {
compatible = "ti,omap-twl4030";ti,model = "omap3logic";ti,mcbsp = <&mcbsp2>;- };
- leds {
compatible = "gpio-leds";pinctrl-names = "default";pinctrl-0 = <&led_pins>;led1 {label = "led1";gpios = <&gpio6 20 GPIO_ACTIVE_HIGH>; /* gpio180 */linux,default-trigger = "cpu0";};led2 {label = "led2";gpios = <&gpio6 19 GPIO_ACTIVE_HIGH>; /* gpio179 */linux,default-trigger = "none";};- };
- pwm10: dmtimer-pwm {
compatible = "ti,omap-dmtimer-pwm";pinctrl-names = "default";pinctrl-0 = <&pwm_pins>;ti,timers = <&timer10>;#pwm-cells = <3>;- };
+};
+&vaux1 {
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
+};
+&vaux4 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
+};
+&mcbsp2 {
- status = "okay";
+};
+&charger {
- ti,bb-uvolt = <3200000>;
- ti,bb-uamp = <150>;
+};
+&gpmc {
- ranges = <0 0 0x30000000 0x1000000 /* CS0: 16MB for NAND */
1 0 0x2c000000 0x1000000>; /* CS1: 16MB for LAN9221 */- ethernet@gpmc {
pinctrl-names = "default";pinctrl-0 = <&lan9221_pins>;interrupt-parent = <&gpio5>;interrupts = <1 IRQ_TYPE_LEVEL_LOW>; /* gpio129 */reg = <1 0 0xff>;- };
+};
+&vpll2 {
- regulator-always-on;
+};
+&dss {
- status = "ok";
- vdds_dsi-supply = <&vpll2>;
- vdda_video-supply = <&video_reg>;
- pinctrl-names = "default";
- pinctrl-0 = <&dss_dpi_pins1>;
- port {
dpi_out: endpoint {remote-endpoint = <&lcd_in>;data-lines = <16>;};- };
+};
+/ {
- aliases {
display0 = &lcd0;- };
- video_reg: video_reg {
pinctrl-names = "default";pinctrl-0 = <&panel_pwr_pins>;compatible = "regulator-fixed";regulator-name = "fixed-supply";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;gpio = <&gpio5 27 GPIO_ACTIVE_HIGH>; /* gpio155, lcd INI */- };
- lcd0: display {
compatible = "panel-dpi";label = "15";status = "okay";/* default-on; */pinctrl-names = "default";port {lcd_in: endpoint {remote-endpoint = <&dpi_out>;};};panel-timing {clock-frequency = <9000000>;hactive = <480>;vactive = <272>;hfront-porch = <3>;hback-porch = <2>;hsync-len = <42>;vback-porch = <3>;vfront-porch = <4>;vsync-len = <11>;hsync-active = <0>;vsync-active = <0>;de-active = <1>;pixelclk-active = <1>;};- };
- bl: backlight {
compatible = "pwm-backlight";pinctrl-names = "default";pinctrl-0 = <&backlight_pins>;pwms = <&pwm10 0 5000000 0>;brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;default-brightness-level = <7>;enable-gpios = <&gpio5 26 GPIO_ACTIVE_HIGH>; /* gpio_154 */- };
+};
+&mmc1 {
- interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
- pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins &mmc1_cd>;
- cd-gpios = <&gpio4 31 IRQ_TYPE_LEVEL_LOW>; /* gpio127 */
- vmmc-supply = <&vmmc1>;
- bus-width = <4>;
- cap-power-off-card;
+};
+&mmc2 {
- status = "disabled";
+};
+&omap3_pmx_core {
- gpio_key_pins: pinmux_gpio_key_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x21d6, PIN_INPUT_PULLUP | MUX_MODE4) /* mcspi2_clk.gpio_178 */OMAP3_CORE1_IOPAD(0x21dc, PIN_INPUT_PULLUP | MUX_MODE4) /* mcspi2_cs0.gpio_181 */>;- };
- pwm_pins: pinmux_pwm_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x20B8, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE3) /* gpmc_ncs5.gpt_10_pwm_evt */>;- };
- led_pins: pinmux_led_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x21d8, PIN_OUTPUT | MUX_MODE4) /* gpio_179 */OMAP3_CORE1_IOPAD(0x21da, PIN_OUTPUT | MUX_MODE4) /* gpio_180 */>;- };
- mmc1_pins: pinmux_mmc1_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x2144, PIN_OUTPUT | MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT | MUX_MODE0) /* sdmmc1_cmd.sdmmc1_cmd */OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat0.sdmmc1_dat0 */OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */>;- };
- tsc2004_pins: pinmux_tsc2004_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE4) /* mcbsp4_dr.gpio_153 */>;- };
- backlight_pins: pinmux_backlight_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4) /* mcbsp4_dx.gpio_154 */>;- };
- isp_pins: pinmux_isp_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x210c, PIN_INPUT | MUX_MODE0) /* cam_hs.cam_hs */OMAP3_CORE1_IOPAD(0x210e, PIN_INPUT | MUX_MODE0) /* cam_vs.cam_vs */OMAP3_CORE1_IOPAD(0x2110, PIN_INPUT | MUX_MODE0) /* cam_xclka.cam_xclka */OMAP3_CORE1_IOPAD(0x2112, PIN_INPUT | MUX_MODE0) /* cam_pclk.cam_pclk */OMAP3_CORE1_IOPAD(0x2114, PIN_INPUT | MUX_MODE0) /* cam_d0.cam_d0 */OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0) /* cam_d1.cam_d1 */OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0) /* cam_d2.cam_d2 */OMAP3_CORE1_IOPAD(0x211c, PIN_INPUT | MUX_MODE0) /* cam_d3.cam_d3 */OMAP3_CORE1_IOPAD(0x211e, PIN_INPUT | MUX_MODE0) /* cam_d4.cam_d4 */OMAP3_CORE1_IOPAD(0x2120, PIN_INPUT | MUX_MODE0) /* cam_d5.cam_d5 */OMAP3_CORE1_IOPAD(0x2122, PIN_INPUT | MUX_MODE0) /* cam_d6.cam_d6 */OMAP3_CORE1_IOPAD(0x2124, PIN_INPUT | MUX_MODE0) /* cam_d7.cam_d7 */>;- };
- panel_pwr_pins: pinmux_panel_pwr_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x218a, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4) /* mcbsp4_fs.gpio_155 */>;- };
- dss_dpi_pins1: pinmux_dss_dpi_pins1 {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_pclk.dss_pclk */OMAP3_CORE1_IOPAD(0x20d6, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_hsync.dss_hsync */OMAP3_CORE1_IOPAD(0x20d8, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_vsync.dss_vsync */OMAP3_CORE1_IOPAD(0x20da, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_acbias.dss_acbias */OMAP3_CORE1_IOPAD(0x20e8, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data6.dss_data6 */OMAP3_CORE1_IOPAD(0x20ea, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data7.dss_data7 */OMAP3_CORE1_IOPAD(0x20ec, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data8.dss_data8 */OMAP3_CORE1_IOPAD(0x20ee, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data9.dss_data9 */OMAP3_CORE1_IOPAD(0x20f0, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data10.dss_data10 */OMAP3_CORE1_IOPAD(0x20f2, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data11.dss_data11 */OMAP3_CORE1_IOPAD(0x20f4, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data12.dss_data12 */OMAP3_CORE1_IOPAD(0x20f6, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data13.dss_data13 */OMAP3_CORE1_IOPAD(0x20f8, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data14.dss_data14 */OMAP3_CORE1_IOPAD(0x20fa, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data15.dss_data15 */OMAP3_CORE1_IOPAD(0x20fc, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data16.dss_data16 */OMAP3_CORE1_IOPAD(0x20fe, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE0) /* dss_data17.dss_data17 */OMAP3_CORE1_IOPAD(0x2100, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE3) /* dss_data18.dss_data0 */OMAP3_CORE1_IOPAD(0x2102, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE3) /* dss_data19.dss_data1 */OMAP3_CORE1_IOPAD(0x2104, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE3) /* dss_data20.dss_data2 */OMAP3_CORE1_IOPAD(0x2106, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE3) /* dss_data21.dss_data3 */OMAP3_CORE1_IOPAD(0x2108, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE3) /* dss_data22.dss_data4 */OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT_PULLDOWN | PIN_OFF_OUTPUT_LOW | MUX_MODE3) /* dss_data23.dss_data5 */>;- };
+};
+&omap3_pmx_wkup {
- gpio_key_pins_wkup: pinmux_gpio_key_pins_wkup {
pinctrl-single,pins = <OMAP3_WKUP_IOPAD(0x2a0a, PIN_INPUT_PULLUP | MUX_MODE4) /* sys_boot0.gpio_2 */OMAP3_WKUP_IOPAD(0x2a14, PIN_INPUT_PULLUP | MUX_MODE4) /* sys_boot5.gpio_7 */>;- };
- lan9221_pins: pinmux_lan9221_pins {
pinctrl-single,pins = <OMAP3_WKUP_IOPAD(0x2a5a, PIN_INPUT | MUX_MODE4) /* reserved.gpio_129 */>;- };
- mmc1_cd: pinmux_mmc1_cd {
pinctrl-single,pins = <OMAP3_WKUP_IOPAD(0x2a54, PIN_INPUT_PULLUP | MUX_MODE4) /* reserved.gpio_127 */>;- };
+};
+&i2c2 {
- mt9p031@48 {
compatible = "aptina,mt9p031";reg = <0x48>;clocks = <&isp 0>;vaa-supply = <&vaux4>;vdd-supply = <&vaux4>;vdd_io-supply = <&vaux4>;port {mt9p031_out: endpoint {input-clock-frequency = <24000000>;pixel-clock-frequency = <72000000>;remote-endpoint = <&ccdc_ep>;};};- };
+};
+&i2c3 {
- touchscreen: tsc2004@48 {
compatible = "ti,tsc2004";reg = <0x48>;vio-supply = <&vaux1>;pinctrl-names = "default";pinctrl-0 = <&tsc2004_pins>;interrupts-extended = <&gpio5 25 IRQ_TYPE_EDGE_RISING>; /* gpio 153 */touchscreen-fuzz-x = <4>;touchscreen-fuzz-y = <7>;touchscreen-fuzz-pressure = <2>;touchscreen-size-x = <4096>;touchscreen-size-y = <4096>;touchscreen-max-pressure = <2048>;ti,x-plate-ohms = <280>;ti,esd-recovery-timeout-ms = <8000>;- };
+};
+&mcspi1 {
- at25@0 {
compatible = "atmel,at25";reg = <0>;spi-max-frequency = <5000000>;spi-cpha;spi-cpol;pagesize = <64>;size = <32768>;address-width = <16>;- };
+};
+&isp {
- pinctrl-names = "default";
- pinctrl-0 = <&isp_pins>;
- ports {
port@0 {reg = <0>;ccdc_ep: endpoint {remote-endpoint = <&mt9p031_out>;bus-width = <8>;hsync-active = <1>;vsync-active = <1>;pclk-sample = <0>;};};- };
+};
+&uart1 {
- interrupts-extended = <&intc 72 &omap3_pmx_core OMAP3_UART1_RX>;
+};
+/* Wired to the tps65950 on the SOM, only the USB connector is on the devkit */ +&usb_otg_hs {
- pinctrl-names = "default";
- pinctrl-0 = <&hsusb_otg_pins>;
- interface-type = <0>;
- usb-phy = <&usb2_phy>;
- phys = <&usb2_phy>;
- phy-names = "usb2-phy";
- mode = <3>;
- power = <50>;
+}; diff --git a/arch/arm/dts/logicpd-torpedo-som.dtsi b/arch/arm/dts/logicpd-torpedo-som.dtsi new file mode 100644 index 0000000..23c9228 --- /dev/null +++ b/arch/arm/dts/logicpd-torpedo-som.dtsi @@ -0,0 +1,217 @@ +/*
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
- */
+#include <dt-bindings/input/input.h>
+/ {
- cpus {
cpu@0 {cpu0-supply = <&vcc>;};- };
- memory@80000000 {
device_type = "memory";reg = <0x80000000 0>;- };
- leds {
compatible = "gpio-leds";user0 {label = "user0";gpios = <&twl_gpio 18 GPIO_ACTIVE_LOW>; /* LEDA */linux,default-trigger = "none";};- };
- wl12xx_vmmc: wl12xx_vmmc {
compatible = "regulator-fixed";regulator-name = "vwl1271";regulator-min-microvolt = <1800000>;regulator-max-microvolt = <1800000>;gpio = <&gpio5 29 0>; /* gpio157 */startup-delay-us = <70000>;enable-active-high;vin-supply = <&vmmc2>;- };
+};
+&gpmc {
- ranges = <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */
- nand@0,0 {
compatible = "ti,omap2-nand";reg = <0 0 4>; /* CS0, offset 0, IO size 4 */interrupt-parent = <&gpmc>;interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */<1 IRQ_TYPE_NONE>; /* termcount */linux,mtd-name = "micron,mt29f4g16abbda3w";nand-bus-width = <16>;ti,nand-ecc-opt = "bch8";rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */gpmc,sync-clk-ps = <0>;gpmc,cs-on-ns = <0>;gpmc,cs-rd-off-ns = <44>;gpmc,cs-wr-off-ns = <44>;gpmc,adv-on-ns = <6>;gpmc,adv-rd-off-ns = <34>;gpmc,adv-wr-off-ns = <44>;gpmc,we-off-ns = <40>;gpmc,oe-off-ns = <54>;gpmc,access-ns = <64>;gpmc,rd-cycle-ns = <82>;gpmc,wr-cycle-ns = <82>;gpmc,wr-access-ns = <40>;gpmc,wr-data-mux-bus-ns = <0>;gpmc,device-width = <2>;#address-cells = <1>;#size-cells = <1>;- };
+};
+&i2c1 {
- clock-frequency = <400000>;
- twl: twl@48 {
reg = <0x48>;interrupts = <7>; /* SYS_NIRQ cascaded to intc */interrupt-parent = <&intc>;twl_audio: audio {compatible = "ti,twl4030-audio";codec {};};- };
+};
+&i2c2 {
- clock-frequency = <400000>;
+};
+&i2c3 {
- clock-frequency = <400000>;
- at24@50 {
compatible = "at24,24c02";readonly;reg = <0x50>;- };
+};
+/*
- Only found on the wireless SOM. For the SOM without wireless, the pins for
- MMC3 can be routed with jumpers to the second MMC slot on the devkit and
- gpio157 is not connected. So this should be OK to keep common for now,
- probably device tree overlays is the way to go with the various SOM and
- jumpering combinations for the long run.
- */
+&mmc3 {
- interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
- pinctrl-0 = <&mmc3_pins &mmc3_core2_pins>;
- pinctrl-names = "default";
- vmmc-supply = <&wl12xx_vmmc>;
- non-removable;
- bus-width = <4>;
- cap-power-off-card;
- #address-cells = <1>;
- #size-cells = <0>;
- wlcore: wlcore@2 {
compatible = "ti,wl1283";reg = <2>;interrupt-parent = <&gpio5>;interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; /* gpio 152 */ref-clock-frequency = <26000000>;tcxo-clock-frequency = <26000000>;- };
+};
+&omap3_pmx_core {
- mmc3_pins: pinmux_mm3_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x2164, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat4.sdmmc3_dat0 */OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat5.sdmmc3_dat1 */OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat2 */OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat3 */OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4) /* mcbsp4_clkx.gpio_152 */OMAP3_CORE1_IOPAD(0x218e, PIN_OUTPUT | MUX_MODE4) /* mcbsp1_fsr.gpio_157 */>;- };
- mcbsp2_pins: pinmux_mcbsp2_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0) /* mcbsp2_fsx */OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0) /* mcbsp2_clkx */OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0) /* mcbsp2_dr */OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0) /* mcbsp2_dx */>;- };
- uart2_pins: pinmux_uart2_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT | MUX_MODE0) /* uart2_cts.uart2_cts */OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0) /* uart2_rts .uart2_rts*/OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */OMAP3_CORE1_IOPAD(0x2198, PIN_OUTPUT | MUX_MODE4) /* GPIO_162,BT_EN */>;- };
- mcspi1_pins: pinmux_mcspi1_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x21c8, PIN_INPUT | MUX_MODE0) /* mcspi1_clk.mcspi1_clk */OMAP3_CORE1_IOPAD(0x21ca, PIN_OUTPUT | MUX_MODE0) /* mcspi1_simo.mcspi1_simo */OMAP3_CORE1_IOPAD(0x21cc, PIN_INPUT_PULLUP | MUX_MODE0) /* mcspi1_somi.mcspi1_somi */OMAP3_CORE1_IOPAD(0x21ce, PIN_OUTPUT | MUX_MODE0) /* mcspi1_cs0.mcspi1_cs0 */>;- };
- hsusb_otg_pins: pinmux_hsusb_otg_pins {
pinctrl-single,pins = <OMAP3_CORE1_IOPAD(0x21a2, PIN_INPUT | MUX_MODE0) /* hsusb0_clk.hsusb0_clk */OMAP3_CORE1_IOPAD(0x21a4, PIN_OUTPUT | MUX_MODE0) /* hsusb0_stp.hsusb0_stp */OMAP3_CORE1_IOPAD(0x21a6, PIN_INPUT | MUX_MODE0) /* hsusb0_dir.hsusb0_dir */OMAP3_CORE1_IOPAD(0x21a8, PIN_INPUT | MUX_MODE0) /* hsusb0_nxt.hsusb0_nxt */OMAP3_CORE1_IOPAD(0x21aa, PIN_INPUT | MUX_MODE0) /* hsusb0_data0.hsusb0_data0 */OMAP3_CORE1_IOPAD(0x21ac, PIN_INPUT | MUX_MODE0) /* hsusb0_data1.hsusb0_data1 */OMAP3_CORE1_IOPAD(0x21ae, PIN_INPUT | MUX_MODE0) /* hsusb0_data2.hsusb0_data2 */OMAP3_CORE1_IOPAD(0x21b0, PIN_INPUT | MUX_MODE0) /* hsusb0_data3.hsusb0_data3 */OMAP3_CORE1_IOPAD(0x21b2, PIN_INPUT | MUX_MODE0) /* hsusb0_data4.hsusb0_data4 */OMAP3_CORE1_IOPAD(0x21b4, PIN_INPUT | MUX_MODE0) /* hsusb0_data5.hsusb0_data5 */OMAP3_CORE1_IOPAD(0x21b6, PIN_INPUT | MUX_MODE0) /* hsusb0_data6.hsusb0_data6 */OMAP3_CORE1_IOPAD(0x21b8, PIN_INPUT | MUX_MODE0) /* hsusb0_data7.hsusb0_data7 */>;- };
+};
+&uart2 {
- interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>;
- pinctrl-names = "default";
- pinctrl-0 = <&uart2_pins>;
+};
+&mcspi1 {
- pinctrl-names = "default";
- pinctrl-0 = <&mcspi1_pins>;
+};
+&omap3_pmx_core2 {
- mmc3_core2_pins: pinmux_mmc3_core2_pins {
pinctrl-single,pins = <OMAP3630_CORE2_IOPAD(0x25d8, PIN_INPUT_PULLUP | MUX_MODE2) /* etk_clk.sdmmc3_clk */OMAP3630_CORE2_IOPAD(0x25da, PIN_INPUT_PULLUP | MUX_MODE2) /* etk_ctl.sdmmc3_cmd */>;- };
+};
+#include "twl4030.dtsi" +#include "twl4030_omap3.dtsi"
+&twl {
- twl_power: power {
compatible = "ti,twl4030-power-idle-osc-off", "ti,twl4030-power-idle";ti,use_poweroff;- };
+};
+&twl_gpio {
- ti,use-leds;
+}; diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig index 933fcba..a9d7e29 100644 --- a/arch/arm/mach-omap2/omap3/Kconfig +++ b/arch/arm/mach-omap2/omap3/Kconfig @@ -67,7 +67,6 @@ config TARGET_MCX
config TARGET_OMAP3_LOGIC bool "OMAP3 Logic"
- select BOARD_LATE_INIT select DM select DM_SERIAL select DM_GPIO
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 4ad496e..495bc73 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -40,53 +40,6 @@ DECLARE_GLOBAL_DATA_PTR; #define GPIO_IO_PWRDNZ (1 << 6) #define PBIASLITEVMODE1 (1 << 8)
-/*
- two dimensional array of strucures containining board name and Linux
- machine IDs; row it selected based on CPU column is slected based
- on hsusb0_data5 pin having a pulldown resistor
- */
-static const struct ns16550_platdata omap3logic_serial = {
- .base = OMAP34XX_UART1,
- .reg_shift = 2,
- .clock = V_NS16550_CLK,
- .fcr = UART_FCR_DEFVAL,
-};
-U_BOOT_DEVICE(omap3logic_uart) = {
- "ns16550_serial",
- &omap3logic_serial
-};
-static struct board_id {
- char *name;
- int machine_id;
- char *fdtfile;
-} boards[2][2] = {
- {
{.name = "OMAP35xx SOM LV",.machine_id = MACH_TYPE_OMAP3530_LV_SOM,.fdtfile = "logicpd-som-lv-35xx-devkit.dtb",},{.name = "OMAP35xx Torpedo",.machine_id = MACH_TYPE_OMAP3_TORPEDO,.fdtfile = "logicpd-torpedo-35xx-devkit.dtb",},- },
- {
{.name = "DM37xx SOM LV",.fdtfile = "logicpd-som-lv-37xx-devkit.dtb",},{.name = "DM37xx Torpedo",.fdtfile = "logicpd-torpedo-37xx-devkit.dtb",},- },
-};
#ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { @@ -159,11 +112,6 @@ int misc_init_r(void) }
/*
- BOARD_ID_GPIO - GPIO of pin with optional pulldown resistor on SOM LV
- */
-#define BOARD_ID_GPIO 189 /* hsusb0_data5 pin */
-/*
- Routine: board_init
- Description: Early hardware init.
*/ @@ -177,60 +125,6 @@ int board_init(void) return 0; }
-#ifdef CONFIG_BOARD_LATE_INIT -int board_late_init(void) -{
- struct board_id *board;
- unsigned int val;
- /*
* To identify between a SOM LV and Torpedo module,* a pulldown resistor is on hsusb0_data5 for the SOM LV module.* Drive the pin (and let it soak), then read it back.* If the pin is still high its a Torpedo. If low its a SOM LV*/- /* Mux hsusb0_data5 as a GPIO */
- MUX_VAL(CP(HSUSB0_DATA5), (IEN | PTD | DIS | M4));
- if (gpio_request(BOARD_ID_GPIO, "husb0_data5.gpio_189") == 0) {
/** Drive BOARD_ID_GPIO - the pulldown resistor on the SOM LV* will drain the voltage.*/gpio_direction_output(BOARD_ID_GPIO, 0);gpio_set_value(BOARD_ID_GPIO, 1);/* Let it soak for a bit */sdelay(0x100);/** Read state of BOARD_ID_GPIO as an input and if its set.* If so the board is a Torpedo*/gpio_direction_input(BOARD_ID_GPIO);val = gpio_get_value(BOARD_ID_GPIO);gpio_free(BOARD_ID_GPIO);board = &boards[!!(get_cpu_family() == CPU_OMAP36XX)][!!val];printf("Board: %s\n", board->name);/* Set the machine_id passed to Linux */if (board->machine_id)gd->bd->bi_arch_number = board->machine_id;/* If the user has not set fdtimage, set the default */if (!getenv("fdtimage"))setenv("fdtimage", board->fdtfile);- }
- /* restore hsusb0_data5 pin as hsusb0_data5 */
- MUX_VAL(CP(HSUSB0_DATA5), (IEN | PTD | DIS | M0));
- return 0;
-} -#endif
#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { @@ -598,3 +492,18 @@ void set_muxconf_regs(void) MUX_VAL(CP(D2D_MBUSFLAG), (IEN | PTD | DIS | M0)); /*d2d_mbusflag*/ MUX_VAL(CP(D2D_SBUSFLAG), (IEN | PTD | DIS | M0)); /*d2d_sbusflag*/ }
+/* This is only needed until SPL gets OF support */ +#ifdef CONFIG_SPL_BUILD +static const struct ns16550_platdata omap3logic_serial = {
- .base = OMAP34XX_UART1,
- .reg_shift = 2,
- .clock = V_NS16550_CLK,
- .fcr = UART_FCR_DEFVAL,
+};
+U_BOOT_DEVICE(omap3logic_uart) = {
- "ns16550_serial",
- &omap3logic_serial
+}; +#endif diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 89bf38f..13c996d 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_OMAP3_LOGIC=y CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_DEFAULT_DEVICE_TREE="logicpd-torpedo-37xx-devkit" CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y @@ -36,6 +37,11 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_OF_CONTROL=y +# CONFIG_BLK is not set +CONFIG_DM_I2C=y +CONFIG_DM_MMC=y +# CONFIG_DM_MMC_OPS is not set CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP36XX_PINS=y CONFIG_SYS_NS16550=y @@ -46,4 +52,3 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="TI" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 -CONFIG_OF_LIBFDT=y diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig new file mode 100644 index 0000000..2b1eeba --- /dev/null +++ b/configs/omap3_logic_somlv_defconfig @@ -0,0 +1,54 @@ +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_OMAP3_LOGIC=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_DEFAULT_DEVICE_TREE="logicpd-som-lv-37xx-devkit" +CONFIG_SYS_EXTRA_OPTIONS="NAND" +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_VERSION_VARIABLE=y +CONFIG_SPL=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_STACK_R=y +CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_OS_BOOT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="OMAP Logic # " +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_ASKENV=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_UBI=y +CONFIG_ISO_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_OF_CONTROL=y +# CONFIG_BLK is not set +CONFIG_DM_I2C=y +CONFIG_DM_MMC=y +# CONFIG_DM_MMC_OPS is not set +CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_OMAP36XX_PINS=y +CONFIG_SYS_NS16550=y +CONFIG_USB=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="TI" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 706175c..dde52e7 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -17,6 +17,20 @@
#include <configs/ti_omap3_common.h>
+#ifdef CONFIG_SPL_BUILD +/*
- Disable MMC DM for SPL build and can be re-enabled after adding
- DM support in SPL
- */
+#undef CONFIG_DM_MMC +#undef OMAP_HSMMC_USE_GPIO
+/* select serial console configuration for SPL */ +#undef CONFIG_CONS_INDEX +#define CONFIG_CONS_INDEX 1 +#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 +#endif
/*
- We are only ever GP parts and will utilize all of the "downloaded image"
- area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB) in
@@ -34,16 +48,10 @@ /* Hardware drivers */
/* GPIO banks */ -#define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ +#define CONFIG_OMAP3_GPIO_4 /* GPIO 96..128 is in GPIO bank 4 */
#define CONFIG_USB_OMAP3
-/* select serial console configuration */ -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 1 -#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#define CONFIG_SERIAL1 1 /* UART1 on OMAP Logic boards */
/* commands to include */ #define CONFIG_CMD_NAND #define CONFIG_CMD_MTDPARTS @@ -52,8 +60,6 @@ /* I2C */ #define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM AT24C64 */ -#define EXPANSION_EEPROM_I2C_BUS 2 /* I2C Bus for AT24C64 */ -#define CONFIG_OMAP3_LOGIC_USE_NEW_PRODUCT_ID
/* USB */ #define CONFIG_USB_MUSB_OMAP2PLUS @@ -138,6 +144,7 @@ "fi; " \ "else run defaultboot; fi\0" \ "defaultboot=run mmcramboot\0" \
- "fdtimage=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "consoledevice=ttyO0\0" \ "setconsole=setenv console ${consoledevice},${baudrate}n8\0" \ "dump_bootargs=echo 'Bootargs: '; echo $bootargs\0" \