Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a77398b authored Sep 11, 2012 by Shawn Guo

Merge tag 'mxs-dt-3.7' into mxs/clk-dt-lookup

mxs-dt-3.7

- Remove all board files and make mach-mxs a DT-only platform
- Some dts file formatting and style fixing
- DTS update for additional boards and devices

parents d9875690 13b4569b

arch/arm/boot/dts/imx23-evk.dts

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -42,12 +42,13 @@
	pinctrl-names = "default";		pinctrl-names = "default";
	pinctrl-0 = <&hog_pins_a>;		pinctrl-0 = <&hog_pins_a>;

	hog_pins_a: hog-gpios@0 {		hog_pins_a: hog@0 {
	reg = <0>;		reg = <0>;
	fsl,pinmux-ids = <		fsl,pinmux-ids = <
	0x1123 /* MX23_PAD_LCD_RESET__GPIO_1_18 */		0x1123 /* MX23_PAD_LCD_RESET__GPIO_1_18 */
	0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */		0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */
	0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */		0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */
			0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */
	>;		>;
	fsl,drive-strength = <0>;		fsl,drive-strength = <0>;
	fsl,voltage = <1>;		fsl,voltage = <1>;

arch/arm/boot/dts/imx23-olinuxino.dts

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,21 @@
	bus-width = <4>;		bus-width = <4>;
	status = "okay";		status = "okay";
	};		};

			pinctrl@80018000 {
			pinctrl-names = "default";
			pinctrl-0 = <&hog_pins_a>;

			hog_pins_a: hog@0 {
			reg = <0>;
			fsl,pinmux-ids = <
			0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */
			>;
			fsl,drive-strength = <0>;
			fsl,voltage = <1>;
			fsl,pull-up = <0>;
			};
			};
	};		};

	apbx@80040000 {		apbx@80040000 {
	@@ -39,6 +54,22 @@
	pinctrl-0 = <&duart_pins_a>;		pinctrl-0 = <&duart_pins_a>;
	status = "okay";		status = "okay";
	};		};

			auart0: serial@8006c000 {
			pinctrl-names = "default";
			pinctrl-0 = <&auart0_2pins_a>;
			status = "okay";
			};
			};
			};

			leds {
			compatible = "gpio-leds";

			user {
			label = "green";
			gpios = <&gpio2 1 0>;
			linux,default-trigger = "default-on";
	};		};
	};		};
	};		};

arch/arm/boot/dts/imx23-stmp378x_devb.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@
	pinctrl-names = "default";		pinctrl-names = "default";
	pinctrl-0 = <&hog_pins_a>;		pinctrl-0 = <&hog_pins_a>;

	hog_pins_a: hog-gpios@0 {		hog_pins_a: hog@0 {
	reg = <0>;		reg = <0>;
	fsl,pinmux-ids = <		fsl,pinmux-ids = <
	0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */		0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */

arch/arm/boot/dts/imx23.dtsi

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -140,6 +140,17 @@
	fsl,pull-up = <0>;		fsl,pull-up = <0>;
	};		};

			auart0_2pins_a: auart0-2pins@0 {
			reg = <0>;
			fsl,pinmux-ids = <
			0x01e2 /* MX23_PAD_I2C_SCL__AUART1_TX */
			0x01f2 /* MX23_PAD_I2C_SDA__AUART1_RX */
			>;
			fsl,drive-strength = <0>;
			fsl,voltage = <1>;
			fsl,pull-up = <0>;
			};

	gpmi_pins_a: gpmi-nand@0 {		gpmi_pins_a: gpmi-nand@0 {
	reg = <0>;		reg = <0>;
	fsl,pinmux-ids = <		fsl,pinmux-ids = <
	@@ -183,7 +194,6 @@
	0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */		0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */
	0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */		0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */
	0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */		0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */
	0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */
	0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */		0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */
	>;		>;
	fsl,drive-strength = <1>;		fsl,drive-strength = <1>;

arch/arm/boot/dts/imx28-apx4devkit.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -37,7 +37,7 @@
	pinctrl-names = "default";		pinctrl-names = "default";
	pinctrl-0 = <&hog_pins_a>;		pinctrl-0 = <&hog_pins_a>;

	hog_pins_a: hog-gpios@0 {		hog_pins_a: hog@0 {
	reg = <0>;		reg = <0>;
	fsl,pinmux-ids = <		fsl,pinmux-ids = <
	0x0113 /* MX28_PAD_GPMI_CE1N__GPIO_0_17 */		0x0113 /* MX28_PAD_GPMI_CE1N__GPIO_0_17 */