Commit d234e423 authored by Dmitry Lifshitz's avatar Dmitry Lifshitz Committed by Tony Lindgren
Browse files

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: default avatarDmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent fb5f895f

arch/arm/boot/dts/omap3-cm-t3730.dts

+0 −41
Original line number Original line Diff line number Diff line
@@ -32,16 +32,6 @@ wl12xx_vaux2: wl12xx_vaux2 { 
};

};





&omap3_pmx_core {

&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 {

	mmc2_pins: pinmux_mmc2_pins {

		pinctrl-single,pins = <

		pinctrl-single,pins = <
@@ -54,20 +44,6 @@ OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_da 
		>;

		>;

	};

	};





	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 {

	wl12xx_gpio: pinmux_wl12xx_gpio {

		pinctrl-single,pins = <

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE4)	/* dss_data3.gpio_73 */

			OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE4)	/* dss_data3.gpio_73 */
@@ -76,13 +52,6 @@ OMAP3_CORE1_IOPAD(0x2164, PIN_INPUT | MUX_MODE4) /* sdmmc2_dat4.gpio_136 */ 
	};

	};

};

};





&mmc1 {

	vmmc-supply = <&vmmc1>;

	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

};



&mmc2 {

&mmc2 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

	pinctrl-0 = <&mmc2_pins>;
@@ -92,13 +61,3 @@ &mmc2 { 
	bus-width = <4>;

	bus-width = <4>;

	cap-power-off-card;

	cap-power-off-card;

};
 
};
 


&smsc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smsc1_pins>;

};



&uart3 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins>;

};

arch/arm/boot/dts/omap3-cm-t3x.dtsi

0 → 100644
+60 −0
Original line number Original line Diff line number Diff line 
/*

 * 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>;

};

arch/arm/boot/dts/omap3-cm-t3x30.dtsi

+17 −19
Original line number Original line Diff line number Diff line 
/*

/*

 * Common support for CompuLab CM-T3530 and  CM-T3730

 * Common support for CompuLab CM-T3x30 CoMs

 */

 */





/ {

#include "omap3-cm-t3x.dtsi"

	memory {

		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256 MB */

	};





/ {

	cpus {

	cpus {

		cpu@0 {

		cpu@0 {

			cpu0-supply = <&vcc>;

			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 {

	vddvario: regulator-vddvario {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

		regulator-name = "vddvario";

		regulator-name = "vddvario";
@@ -36,11 +24,23 @@ vdd33a: regulator-vdd33a { 
	};

	};

};

};





&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 {

&gpmc {

	ranges = <5 0 0x2c000000 0x01000000>;

	ranges = <5 0 0x2c000000 0x01000000>;





	smsc1: ethernet@5,0 {

	smsc1: ethernet@5,0 {

		compatible = "smsc,lan9221", "smsc,lan9115";

		compatible = "smsc,lan9221", "smsc,lan9115";

		pinctrl-names = "default";

		pinctrl-0 = <&smsc1_pins>;

		interrupt-parent = <&gpio6>;

		interrupt-parent = <&gpio6>;

		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;

		reg = <5 0 0xff>;

		reg = <5 0 0xff>;
@@ -74,8 +74,6 @@ smsc1: ethernet@5,0 { 
};

};





&i2c1 {

&i2c1 {

	clock-frequency = <400000>;



	twl: twl@48 {

	twl: twl@48 {

		reg = <0x48>;

		reg = <0x48>;

		interrupts = <7>; /* SYS_NIRQ cascaded to intc */

		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
@@ -86,8 +84,8 @@ twl: twl@48 { 
#include "twl4030.dtsi"

#include "twl4030.dtsi"

#include "twl4030_omap3.dtsi"

#include "twl4030_omap3.dtsi"





&i2c3 {

&mmc1 {

	clock-frequency = <400000>;

	vmmc-supply = <&vmmc1>;

};

};





&twl_gpio {

&twl_gpio {

arch/arm/boot/dts/omap3-sb-t35.dtsi

+11 −0
Original line number Original line Diff line number Diff line
@@ -2,11 +2,22 @@ 
 * Common support for CompuLab SB-T35 used on SBC-T3530, SBC-T3517 and SBC-T3730

 * 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 {

&gpmc {

	ranges = <4 0 0x2d000000 0x01000000>;

	ranges = <4 0 0x2d000000 0x01000000>;





	smsc2: ethernet@4,0 {

	smsc2: ethernet@4,0 {

		compatible = "smsc,lan9221", "smsc,lan9115";

		compatible = "smsc,lan9221", "smsc,lan9115";

		pinctrl-names = "default";

		pinctrl-0 = <&smsc2_pins>;

		interrupt-parent = <&gpio3>;

		interrupt-parent = <&gpio3>;

		interrupts = <1 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <1 IRQ_TYPE_LEVEL_LOW>;

		reg = <4 0 0xff>;

		reg = <4 0 0xff>;

arch/arm/boot/dts/omap3-sbc-t3730.dts

+0 −14
Original line number Original line Diff line number Diff line
@@ -14,17 +14,3 @@ &gpmc { 
	ranges = <5 0 0x2c000000 0x01000000>,

	ranges = <5 0 0x2c000000 0x01000000>,

		 <4 0 0x2d000000 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 */

		>;

	};

};