Commit 839a8d77 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mxs-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt 

- 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

* tag 'mxs-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6: (28 commits)
  ARM: dts: cfa10049: Add the 74HC595 gpio expanders
  ARM: dts: m28evk: Fix MMC WP pin being inverted
  ARM: dts: cfa10049: Add SSP3 to the 10049 board
  ARM: dts: mxs: Add missing address and size cells in SSP nodes
  ARM: mx28evk: Add I2C EEPROM support
  ARM: dts: mxs: Enable USB1 Host on the CFA-10049 expansion board
  ARM: dts: mxs: Add the second I2C adapter to the CFA10049 expansion board
  ARM: dts: mxs: Add I2C1 muxing options for imx28
  ARM: mx28evk: Add LRADC support
  ARM: mx28evk: Add SPI flash support
  ARM: mxs: Update DENX M28 machine and dts file
  ARM: mx28: Add USB PHY overcurrent pinmux
  ARM: mx28: Add SPI 2 pinmux into imx28.dtsi
  ARM: dts: mxs: Add pwm4 muxing options for imx28
  ARM: dts: mxs: Add alternative I2C muxing options for imx28
  ARM: olinuxino: Add gpio-led support
  ARM: mxs: Let mmc0 pin detect be generic
  ARM: mxs: Rename 'hog-gpios'
  ARM: mxs: remove iomux driver
  ARM: mxs: remove platform device codes
  ...
parents fd6c9b75 13b4569b

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

+2 −1
Original line number Diff line number Diff line
@@ -42,12 +42,13 @@ 
				pinctrl-names = "default";

				pinctrl-0 = <&hog_pins_a>;



				hog_pins_a: hog-gpios@0 {

				hog_pins_a: hog@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x1123 /* MX23_PAD_LCD_RESET__GPIO_1_18 */

						0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */

						0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */

						0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

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

+31 −0
Original line number Diff line number Diff line
@@ -31,6 +31,21 @@ 
				bus-width = <4>;

				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 {
@@ -39,6 +54,22 @@ 
				pinctrl-0 = <&duart_pins_a>;

				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 Diff line number Diff line
@@ -36,7 +36,7 @@ 
				pinctrl-names = "default";

				pinctrl-0 = <&hog_pins_a>;



				hog_pins_a: hog-gpios@0 {

				hog_pins_a: hog@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */

arch/arm/boot/dts/imx23.dtsi

+11 −1
Original line number Diff line number Diff line
@@ -140,6 +140,17 @@ 
					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 {

					reg = <0>;

					fsl,pinmux-ids = <
@@ -183,7 +194,6 @@ 
						0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */

						0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */

						0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */

						0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */

						0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */

					>;

					fsl,drive-strength = <1>;

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
				pinctrl-names = "default";

				pinctrl-0 = <&hog_pins_a>;



				hog_pins_a: hog-gpios@0 {

				hog_pins_a: hog@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x0113 /* MX28_PAD_GPMI_CE1N__GPIO_0_17 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE