ARM: dts: sbc-t3x: refactor DT support

Refactor the sbc-t3x device tree as a preparation for additional
(sbc-t3530, sbc-t3517, etc.) boards support.

No functional changes.

The device tree will have the following structure:

omap3-cm-t3x.dtsi
 |
 |<-- omap3-cm-t3x30.dtsi
 |     |
 |     |
 |     |     -----                  -------          ------------
 |     |    | CoM |                | Board |        | Base board |
 |     |     -----                  -------          ------------
 |     |                                            omap3-sb-t35.dtsi
 |     |                                                  |
 |     |<-- omap3-cm-t3730.dts <-- omap3-sbc-t3730.dts -->|
 |     |                                                  |
 |     |<-- omap3-cm-t3530.dts <-- omap3-sbc-t3530.dts -->|
 |                                                        |
 |<-------- omap3-cm-t3517.dts <-- omap3-sbc-t3517.dts -->|

Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap3-cm-t3730.dts b/arch/arm/boot/dts/omap3-cm-t3730.dts
index 508cd9b413fb1520a99a7251e63085efcc1234ca..b3f9a50b3bc8339d269307001f6cd7563205b79f 100644 (file)
--- a/arch/arm/boot/dts/omap3-cm-t3730.dts
+++ b/arch/arm/boot/dts/omap3-cm-t3730.dts
@@ -32,16 +32,6 @@
 };
 
 &omap3_pmx_core {
-       mmc1_pins: pinmux_mmc1_pins {
-               pinctrl-single,pins = <
-                       OMAP3_CORE1_IOPAD(0x2144, PIN_OUTPUT_PULLUP | MUX_MODE0)/* sdmmc1_clk.sdmmc1_clk */
-                       OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_cmd.sdmmc1_cmd */
-                       OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat0.sdmmc1_dat0 */
-                       OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */
-                       OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */
-                       OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */
-               >;
-       };
 
        mmc2_pins: pinmux_mmc2_pins {
                pinctrl-single,pins = <
@@ -54,20 +44,6 @@
                >;
        };
 
-       smsc1_pins: pinmux_smsc1_pins {
-               pinctrl-single,pins = <
-                       OMAP3_CORE1_IOPAD(0x20b8, PIN_OUTPUT | MUX_MODE0)       /* gpmc_ncs5.gpmc_ncs5 */
-                       OMAP3_CORE1_IOPAD(0x219a, PIN_INPUT_PULLUP | MUX_MODE4) /* uart3_cts_rctx.gpio_163 */
-               >;
-       };
-
-       uart3_pins: pinmux_uart3_pins {
-               pinctrl-single,pins = <
-                       OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0)        /* uart3_rx_irrx.uart3_rx_irrx */
-                       OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0)       /* uart3_tx_irtx.uart3_tx_irtx */
-               >;
-       };
-
        wl12xx_gpio: pinmux_wl12xx_gpio {
                pinctrl-single,pins = <
                        OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE4)       /* dss_data3.gpio_73 */
@@ -76,13 +52,6 @@
        };
 };
 
-&mmc1 {
-       vmmc-supply = <&vmmc1>;
-       bus-width = <4>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&mmc1_pins>;
-};
-
 &mmc2 {
        pinctrl-names = "default";
        pinctrl-0 = <&mmc2_pins>;
@@ -92,13 +61,3 @@
        bus-width = <4>;
        cap-power-off-card;
 };
-
-&smsc1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&smsc1_pins>;
-};
-
-&uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart3_pins>;
-};

diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
new file mode 100644 (file)
index 0000000..ca6090d
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -0,0 +1,60 @@
+/*
+ * Common support for CompuLab CM-T3x CoMs
+ */
+
+/ {
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x10000000>; /* 256 MB */
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               ledb {
+                       label = "cm-t3x:green";
+                       gpios = <&gpio6 26 GPIO_ACTIVE_HIGH>;  /* gpio186 */
+                       linux,default-trigger = "heartbeat";
+               };
+       };
+};
+
+&omap3_pmx_core {
+
+       uart3_pins: pinmux_uart3_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT  | MUX_MODE0)       /* uart3_rx_irrx.uart3_rx_irrx */
+                       OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0)       /* uart3_tx_irtx.uart3_tx_irtx */
+               >;
+       };
+
+       mmc1_pins: pinmux_mmc1_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */
+                       OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_cmd.sdmmc1_cmd */
+                       OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat0.sdmmc1_dat0 */
+                       OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */
+                       OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */
+                       OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */
+               >;
+       };
+};
+
+&uart3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart3_pins>;
+};
+
+&mmc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&mmc1_pins>;
+       bus-width = <4>;
+};
+
+&i2c1 {
+       clock-frequency = <400000>;
+};
+
+&i2c3 {
+       clock-frequency = <400000>;
+};

diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
index 3a9f004d89245454836e032d25ed950fe4e5d4fe..4bcc6395b4d01c3dfc22ce4e68a0b8441ce317ec 100644 (file)
--- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
@@ -1,28 +1,16 @@
 /*
- * Common support for CompuLab CM-T3530 and  CM-T3730
+ * Common support for CompuLab CM-T3x30 CoMs
  */
 
-/ {
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>; /* 256 MB */
-       };
+#include "omap3-cm-t3x.dtsi"
 
+/ {
        cpus {
                cpu@0 {
                        cpu0-supply = <&vcc>;
                };
        };
 
-       leds {
-               compatible = "gpio-leds";
-               ledb {
-                       label = "cm-t35:green";
-                       gpios = <&gpio6 26 GPIO_ACTIVE_HIGH>;  /* gpio186 */
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-
        vddvario: regulator-vddvario {
                compatible = "regulator-fixed";
                regulator-name = "vddvario";
@@ -36,11 +24,23 @@
        };
 };
 
+&omap3_pmx_core {
+
+       smsc1_pins: pinmux_smsc1_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x20b8, PIN_OUTPUT | MUX_MODE0)       /* gpmc_ncs5.gpmc_ncs5 */
+                       OMAP3_CORE1_IOPAD(0x219a, PIN_INPUT_PULLUP | MUX_MODE4) /* uart3_cts_rctx.gpio_163 */
+               >;
+       };
+};
+
 &gpmc {
        ranges = <5 0 0x2c000000 0x01000000>;
 
        smsc1: ethernet@5,0 {
                compatible = "smsc,lan9221", "smsc,lan9115";
+               pinctrl-names = "default";
+               pinctrl-0 = <&smsc1_pins>;
                interrupt-parent = <&gpio6>;
                interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
                reg = <5 0 0xff>;
@@ -74,8 +74,6 @@
 };
 
 &i2c1 {
-       clock-frequency = <400000>;
-
        twl: twl@48 {
                reg = <0x48>;
                interrupts = <7>; /* SYS_NIRQ cascaded to intc */
@@ -86,8 +84,8 @@
 #include "twl4030.dtsi"
 #include "twl4030_omap3.dtsi"
 
-&i2c3 {
-       clock-frequency = <400000>;
+&mmc1 {
+       vmmc-supply = <&vmmc1>;
 };
 
 &twl_gpio {

diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi
index b9a2fedce7ee4e14ee3cbfd5540d1f792d9b4140..b3b6e43810211119c9c54adb222acb0ff96aa33f 100644 (file)
--- a/arch/arm/boot/dts/omap3-sb-t35.dtsi
+++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi
@@ -2,11 +2,22 @@
  * Common support for CompuLab SB-T35 used on SBC-T3530, SBC-T3517 and SBC-T3730
  */
 
+&omap3_pmx_core {
+       smsc2_pins: pinmux_smsc2_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x20b6, PIN_OUTPUT | MUX_MODE0)       /* gpmc_ncs4.gpmc_ncs4 */
+                       OMAP3_CORE1_IOPAD(0x20d2, PIN_INPUT_PULLUP | MUX_MODE4) /* gpmc_wait3.gpio_65 */
+               >;
+       };
+};
+
 &gpmc {
        ranges = <4 0 0x2d000000 0x01000000>;
 
        smsc2: ethernet@4,0 {
                compatible = "smsc,lan9221", "smsc,lan9115";
+               pinctrl-names = "default";
+               pinctrl-0 = <&smsc2_pins>;
                interrupt-parent = <&gpio3>;
                interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
                reg = <4 0 0xff>;

diff --git a/arch/arm/boot/dts/omap3-sbc-t3730.dts b/arch/arm/boot/dts/omap3-sbc-t3730.dts
index 0a8849fb39a8a775d100430c11bf6561c7a0e949..565099cc61c050775042184f9999578e789ed828 100644 (file)
--- a/arch/arm/boot/dts/omap3-sbc-t3730.dts
+++ b/arch/arm/boot/dts/omap3-sbc-t3730.dts
@@ -14,17 +14,3 @@
        ranges = <5 0 0x2c000000 0x01000000>,
                 <4 0 0x2d000000 0x01000000>;
 };
-
-&smsc2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&smsc2_pins>;
-};
-
-&omap3_pmx_core {
-       smsc2_pins: pinmux_smsc2_pins {
-               pinctrl-single,pins = <
-                       OMAP3_CORE1_IOPAD(0x20b6, PIN_OUTPUT | MUX_MODE0)       /* gpmc_ncs4.gpmc_ncs4 */
-                       OMAP3_CORE1_IOPAD(0x20d2, PIN_INPUT_PULLUP | MUX_MODE4) /* gpmc_wait3.gpio_65 */
-               >;
-       };
-};

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 3d5b24dcd9a41e2b7f4c16052bc2d931de74a0e4..0748adec007187bdba93de8908527be0f26252f9 100644 (file)
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -99,7 +99,7 @@ static int omap3_sbc_t3730_twl_callback(struct device *dev,
        int res;
 
        res = gpio_request_one(gpio + 2, GPIOF_OUT_INIT_HIGH,
-                              "wlan rst");
+                              "wlan pwr");
        if (res)
                return res;