Commit e3b897c1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt 

From Shawn Guo <shawn.guo@linaro.org>:

Here is the second (last) batch of mxs mxs device tree changes for 3.6.

* 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: dts: imx28-evk: add usb devices
  ARM: mxs: rename dts files with soc name being the prefix
  ARM: apx4devkit: add pin muxing for GPIOs
  ARM: apx4devkit: remove AUART3
  ARM: apx4devkit: add SSP2 support
  ARM: apx4devkit: fix the bus-width of SSP0 to 4 bits
  ARM: apx4devkit: add display support
  ARM: apx4devkit: add NAND support
  ARM: mxs: add dtb-y target into Makefile.boot
  ARM: mxs: convert stmp378x_devb board to device tree
  ARM: mxs: convert tx28 board to device tree
  ARM: mxs: convert apx4devkit board to device tree
  ARM: mxs: convert m28evk board to device tree
  ARM: dts: imx28: move lcdif control pins into board dts
  ARM: dts: imx28: move extra gpmi-nand pins into board dts

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8d5776d5 5da01270

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

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

 * Copyright 2012 Freescale Semiconductor, Inc.

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/dts-v1/;

/include/ "imx23.dtsi"



/ {

	model = "Freescale STMP378x Development Board";

	compatible = "fsl,stmp378x-devb", "fsl,imx23";



	memory {

		reg = <0x40000000 0x04000000>;

	};



	apb@80000000 {

		apbh@80000000 {

			ssp0: ssp@80010000 {

				compatible = "fsl,imx23-mmc";

				pinctrl-names = "default";

				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;

				bus-width = <4>;

				wp-gpios = <&gpio1 30 0>;

				vmmc-supply = <&reg_vddio_sd0>;

				status = "okay";

			};



			pinctrl@80018000 {

				pinctrl-names = "default";

				pinctrl-0 = <&hog_pins_a>;



				hog_pins_a: hog-gpios@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */

						0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};

			};

		};



		apbx@80040000 {

			auart0: serial@8006c000 {

				pinctrl-names = "default";

				pinctrl-0 = <&auart0_pins_a>;

				status = "okay";

			};



			duart: serial@80070000 {

				pinctrl-names = "default";

				pinctrl-0 = <&duart_pins_a>;

				status = "okay";

			};

		};

	};



	regulators {

		compatible = "simple-bus";



		reg_vddio_sd0: vddio-sd0 {

			compatible = "regulator-fixed";

			regulator-name = "vddio-sd0";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio1 29 0>;

		};

	};

};

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

0 → 100644
+198 −0
Original line number Diff line number Diff line 
/dts-v1/;

/include/ "imx28.dtsi"



/ {

	model = "Bluegiga APX4 Development Kit";

	compatible = "bluegiga,apx4devkit", "fsl,imx28";



	memory {

		reg = <0x40000000 0x04000000>;

	};



	apb@80000000 {

		apbh@80000000 {

			gpmi-nand@8000c000 {

				pinctrl-names = "default";

				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;

				status = "okay";

			};



			ssp0: ssp@80010000 {

				compatible = "fsl,imx28-mmc";

				pinctrl-names = "default";

				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_sck_cfg>;

				bus-width = <4>;

				status = "okay";

			};



			ssp2: ssp@80014000 {

				compatible = "fsl,imx28-mmc";

				pinctrl-names = "default";

				pinctrl-0 = <&mmc2_4bit_pins_apx4 &mmc2_sck_cfg_apx4>;

				bus-width = <4>;

				status = "okay";

			};



			pinctrl@80018000 {

				pinctrl-names = "default";

				pinctrl-0 = <&hog_pins_a>;



				hog_pins_a: hog-gpios@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x0113 /* MX28_PAD_GPMI_CE1N__GPIO_0_17 */

						0x0153 /* MX28_PAD_GPMI_RDY1__GPIO_0_21 */

						0x2123 /* MX28_PAD_SSP2_MISO__GPIO_2_18 */

						0x2131 /* MX28_PAD_SSP2_SS0__GPIO_2_19 */

						0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */

						0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */

						0x4143 /* MX28_PAD_JTAG_RTCK__GPIO_4_20 */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};



				lcdif_pins_apx4: lcdif-apx4@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */

						0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */

						0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */

						0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};



				mmc2_4bit_pins_apx4: mmc2-4bit-apx4@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x2041 /* MX28_PAD_SSP0_DATA4__SSP2_D0 */

						0x2051 /* MX28_PAD_SSP0_DATA5__SSP2_D3 */

						0x2061 /* MX28_PAD_SSP0_DATA6__SSP2_CMD */

						0x2071 /* MX28_PAD_SSP0_DATA7__SSP2_SCK */

						0x2141 /* MX28_PAD_SSP2_SS1__SSP2_D1 */

						0x2151 /* MX28_PAD_SSP2_SS2__SSP2_D2 */

					>;

					fsl,drive-strength = <1>;

					fsl,voltage = <1>;

					fsl,pull-up = <1>;

				};



				mmc2_sck_cfg_apx4: mmc2-sck-cfg-apx4 {

					fsl,pinmux-ids = <

						0x2071 /* MX28_PAD_SSP0_DATA7__SSP2_SCK */

					>;

					fsl,drive-strength = <2>;

					fsl,pull-up = <0>;

				};

			};



			lcdif@80030000 {

				pinctrl-names = "default";

				pinctrl-0 = <&lcdif_24bit_pins_a

					     &lcdif_pins_apx4>;

				status = "okay";

			};

		};



		apbx@80040000 {

			saif0: saif@80042000 {

				pinctrl-names = "default";

				pinctrl-0 = <&saif0_pins_a>;

				status = "okay";

			};



			saif1: saif@80046000 {

				pinctrl-names = "default";

				pinctrl-0 = <&saif1_pins_a>;

				fsl,saif-master = <&saif0>;

				status = "okay";

			};



			i2c0: i2c@80058000 {

				pinctrl-names = "default";

				pinctrl-0 = <&i2c0_pins_a>;

				status = "okay";



				sgtl5000: codec@0a {

					compatible = "fsl,sgtl5000";

					reg = <0x0a>;

					VDDA-supply = <&reg_3p3v>;

					VDDIO-supply = <&reg_3p3v>;



				};



				pcf8563: rtc@51 {

					compatible = "phg,pcf8563";

					reg = <0x51>;

				};

			};



			duart: serial@80074000 {

				pinctrl-names = "default";

				pinctrl-0 = <&duart_pins_a>;

				status = "okay";

			};



			auart0: serial@8006a000 {

				pinctrl-names = "default";

				pinctrl-0 = <&auart0_pins_a>;

				status = "okay";

			};



			auart1: serial@8006c000 {

				pinctrl-names = "default";

				pinctrl-0 = <&auart1_2pins_a>;

				status = "okay";

			};



			auart2: serial@8006e000 {

				pinctrl-names = "default";

				pinctrl-0 = <&auart2_2pins_a>;

				status = "okay";

			};

		};

	};



	ahb@80080000 {

		mac0: ethernet@800f0000 {

			phy-mode = "rmii";

			pinctrl-names = "default";

			pinctrl-0 = <&mac0_pins_a>;

			status = "okay";

		};

	};



	regulators {

		compatible = "simple-bus";



		reg_3p3v: 3p3v {

			compatible = "regulator-fixed";

			regulator-name = "3P3V";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

		};

	};



	sound {

		compatible = "bluegiga,apx4devkit-sgtl5000",

			     "fsl,mxs-audio-sgtl5000";

		model = "apx4devkit-sgtl5000";

		saif-controllers = <&saif0 &saif1>;

		audio-codec = <&sgtl5000>;

	};



	leds {

		compatible = "gpio-leds";



		user {

			label = "Heartbeat";

			gpios = <&gpio3 28 0>;

			linux,default-trigger = "heartbeat";

		};

	};

};

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

+66 −2
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
		apbh@80000000 {

			gpmi-nand@8000c000 {

				pinctrl-names = "default";

				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;

				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg

					     &gpmi_pins_evk>;

				status = "okay";

			};
@@ -59,6 +60,32 @@ 
						0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */

						0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */

						0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */

						0x3083 /* MX28_PAD_AUART2_RX__GPIO_3_8 */

						0x3093 /* MX28_PAD_AUART2_TX__GPIO_3_9 */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};



				gpmi_pins_evk: gpmi-nand-evk@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x0110 /* MX28_PAD_GPMI_CE1N__GPMI_CE1N */

						0x0150 /* MX28_PAD_GPMI_RDY1__GPMI_READY1 */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};



				lcdif_pins_evk: lcdif-evk@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */

						0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */

						0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */

						0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;
@@ -68,7 +95,8 @@ 


			lcdif@80030000 {

				pinctrl-names = "default";

				pinctrl-0 = <&lcdif_24bit_pins_a>;

				pinctrl-0 = <&lcdif_24bit_pins_a

					     &lcdif_pins_evk>;

				panel-enable-gpios = <&gpio3 30 0>;

				status = "okay";

			};
@@ -137,10 +165,28 @@ 
				pinctrl-0 = <&auart3_pins_a>;

				status = "okay";

			};



			usbphy0: usbphy@8007c000 {

				status = "okay";

			};



			usbphy1: usbphy@8007e000 {

				status = "okay";

			};

		};

	};



	ahb@80080000 {

		usb0: usb@80080000 {

			vbus-supply = <&reg_usb0_vbus>;

			status = "okay";

		};



		usb1: usb@80090000 {

			vbus-supply = <&reg_usb1_vbus>;

			status = "okay";

		};



		mac0: ethernet@800f0000 {

			phy-mode = "rmii";

			pinctrl-names = "default";
@@ -185,6 +231,24 @@ 
			regulator-max-microvolt = <3300000>;

			gpio = <&gpio2 15 0>;

		};



		reg_usb0_vbus: usb0_vbus {

			compatible = "regulator-fixed";

			regulator-name = "usb0_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio3 9 0>;

			enable-active-high;

		};



		reg_usb1_vbus: usb1_vbus {

			compatible = "regulator-fixed";

			regulator-name = "usb1_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio3 8 0>;

			enable-active-high;

		};

	};



	sound {

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

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

 * Copyright (C) 2012 Marek Vasut <marex@denx.de>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/dts-v1/;

/include/ "imx28.dtsi"



/ {

	model = "DENX M28EVK";

	compatible = "denx,m28evk", "fsl,imx28";



	memory {

		reg = <0x40000000 0x08000000>;

	};



	apb@80000000 {

		apbh@80000000 {

			gpmi-nand@8000c000 {

				pinctrl-names = "default";

				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;

				status = "okay";



				partition@0 {

					label = "bootloader";

					reg = <0x00000000 0x00300000>;

					read-only;

				};



				partition@1 {

					label = "environment";

					reg = <0x00300000 0x00080000>;

				};



				partition@2 {

					label = "redundant-environment";

					reg = <0x00380000 0x00080000>;

				};



				partition@3 {

					label = "kernel";

					reg = <0x00400000 0x00400000>;

				};



				partition@4 {

					label = "filesystem";

					reg = <0x00800000 0x0f800000>;

				};

			};



			ssp0: ssp@80010000 {

				compatible = "fsl,imx28-mmc";

				pinctrl-names = "default";

				pinctrl-0 = <&mmc0_8bit_pins_a

					     &mmc0_cd_cfg

					     &mmc0_sck_cfg>;

				bus-width = <8>;

				wp-gpios = <&gpio3 10 1>;

				status = "okay";

			};



			pinctrl@80018000 {

				pinctrl-names = "default";

				pinctrl-0 = <&hog_pins_a>;



				hog_pins_a: hog-gpios@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x30a3 /* MX28_PAD_AUART2_CTS__GPIO_3_10 */

						0x30b3 /* MX28_PAD_AUART2_RTS__GPIO_3_11 */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};



				lcdif_pins_m28: lcdif-m28@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						0x11e0 /* MX28_PAD_LCD_DOTCLK__LCD_DOTCLK */

						0x11f0 /* MX28_PAD_LCD_ENABLE__LCD_ENABLE */

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};

			};



			lcdif@80030000 {

				pinctrl-names = "default";

				pinctrl-0 = <&lcdif_24bit_pins_a

					     &lcdif_pins_m28>;

				status = "okay";

			};



			can0: can@80032000 {

				pinctrl-names = "default";

				pinctrl-0 = <&can0_pins_a>;

				status = "okay";

			};



			can1: can@80034000 {

				pinctrl-names = "default";

				pinctrl-0 = <&can1_pins_a>;

				status = "okay";

			};

		};



		apbx@80040000 {

			saif0: saif@80042000 {

				pinctrl-names = "default";

				pinctrl-0 = <&saif0_pins_a>;

				status = "okay";

			};



			saif1: saif@80046000 {

				pinctrl-names = "default";

				pinctrl-0 = <&saif1_pins_a>;

				fsl,saif-master = <&saif0>;

				status = "okay";

			};



			i2c0: i2c@80058000 {

				pinctrl-names = "default";

				pinctrl-0 = <&i2c0_pins_a>;

				status = "okay";



				sgtl5000: codec@0a {

					compatible = "fsl,sgtl5000";

					reg = <0x0a>;

					VDDA-supply = <&reg_3p3v>;

					VDDIO-supply = <&reg_3p3v>;



				};



				eeprom: eeprom@51 {

					compatible = "atmel,24c128";

					reg = <0x51>;

					pagesize = <32>;

				};



				rtc: rtc@68 {

					compatible = "stm,mt41t62";

					reg = <0x68>;

				};

			};



			duart: serial@80074000 {

				pinctrl-names = "default";

				pinctrl-0 = <&duart_pins_a>;

				status = "okay";

			};



			auart0: serial@8006a000 {

				pinctrl-names = "default";

				pinctrl-0 = <&auart0_2pins_a>;

				status = "okay";

			};



			auart3: serial@80070000 {

				pinctrl-names = "default";

				pinctrl-0 = <&auart3_pins_a>;

				status = "okay";

			};

		};

	};



	ahb@80080000 {

		mac0: ethernet@800f0000 {

			phy-mode = "rmii";

			pinctrl-names = "default";

			pinctrl-0 = <&mac0_pins_a>;

			phy-reset-gpios = <&gpio3 11 0>;

			status = "okay";

		};



		mac1: ethernet@800f4000 {

			phy-mode = "rmii";

			pinctrl-names = "default";

			pinctrl-0 = <&mac1_pins_a>;

			status = "okay";

		};

	};



	regulators {

		compatible = "simple-bus";



		reg_3p3v: 3p3v {

			compatible = "regulator-fixed";

			regulator-name = "3P3V";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

		};

	};



	sound {

		compatible = "denx,m28evk-sgtl5000",

			     "fsl,mxs-audio-sgtl5000";

		model = "m28evk-sgtl5000";

		saif-controllers = <&saif0 &saif1>;

		audio-codec = <&sgtl5000>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE