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

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

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

From Shawn Guo <shawn.guo@linaro.org>:
It's based on imx/multiplatform branch.  Most of them are dts changes.
There are also a few imx6 improvement patches in there.

* tag 'imx-dt-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: imx6q: select ARM and PL310 errata
  ARM: imx6q: print silicon version on boot
  ARM i.MX dts: Consistently add labels to devicenodes
  ARM: dts: imx6q-sabresd: add volume up/down gpio keys
  ARM: dts: imx53: pinctl update
  ARM: imx: enable cpufreq for imx6q
  ARM: dts: imx6q: enable snvs lp rtc
  ARM: dts: imx6q-sabreauto: Add basic support
  ARM: imx6q: let users input debug uart port number
  ARM: dts: imx53-qsb: Make DA9053 regulator functional
  ARM: dts: imx53-qsb: Use pinctrl for gpio-led
  ARM i.MX dtsi: Add default bus-width property for esdhc controller

Signed-off-by: default avatarArnd Bregmann <arnd@arndb.de>
parents 93363526 96efb44e

Documentation/devicetree/bindings/arm/fsl.txt

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ i.MX6 Quad SABRE Smart Device Board 
Required root node properties:

    - compatible = "fsl,imx6q-sabresd", "fsl,imx6q";



i.MX6 Quad SABRE Automotive Board

Required root node properties:

    - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";



Generic i.MX boards

-------------------

arch/arm/Kconfig.debug

+13 −13
Original line number Diff line number Diff line
@@ -226,20 +226,12 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on i.MX50 or i.MX53.



	config DEBUG_IMX6Q_UART2

		bool "i.MX6Q Debug UART2"

	config DEBUG_IMX6Q_UART

		bool "i.MX6Q Debug UART"

		depends on SOC_IMX6Q

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX6Q UART2. This is correct for e.g. the SabreLite

                  board.



	config DEBUG_IMX6Q_UART4

		bool "i.MX6Q Debug UART4"

		depends on SOC_IMX6Q

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX6Q UART4.

		  on i.MX6Q.



	config DEBUG_MMP_UART2

		bool "Kernel low-level debugging message via MMP UART2"
@@ -426,6 +418,15 @@ choice 


endchoice



config DEBUG_IMX6Q_UART_PORT

	int "i.MX6Q Debug UART Port (1-5)" if DEBUG_IMX6Q_UART

	range 1 5

	default 1

	depends on SOC_IMX6Q

	help

	  Choose UART port on which kernel low-level debug messages

	  should be output.



config DEBUG_LL_INCLUDE

	string

	default "debug/icedcc.S" if DEBUG_ICEDCC
@@ -435,8 +436,7 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX31_IMX35_UART || \

				 DEBUG_IMX51_UART || \

				 DEBUG_IMX50_IMX53_UART ||\

				 DEBUG_IMX6Q_UART2 || \

				 DEBUG_IMX6Q_UART4

				 DEBUG_IMX6Q_UART

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \ 
	imx53-qsb.dtb \

	imx53-smd.dtb \

	imx6q-arm2.dtb \

	imx6q-sabreauto.dtb \

	imx6q-sabrelite.dtb \

	imx6q-sabresd.dtb

dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \

arch/arm/boot/dts/imx27.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
			reg = <0x10000000 0x10000000>;

			ranges;



			wdog@10002000 {

			wdog: wdog@10002000 {

				compatible = "fsl,imx27-wdt", "fsl,imx21-wdt";

				reg = <0x10002000 0x4000>;

				interrupts = <27>;
@@ -218,7 +218,8 @@ 
				status = "disabled";

			};

		};

		nand@d8000000 {



		nfc: nand@d8000000 {

			#address-cells = <1>;

			#size-cells = <1>;

arch/arm/boot/dts/imx51.dtsi

+23 −20
Original line number Diff line number Diff line
@@ -76,17 +76,18 @@ 
				reg = <0x70000000 0x40000>;

				ranges;



				esdhc@70004000 { /* ESDHC1 */

				esdhc1: esdhc@70004000 {

					compatible = "fsl,imx51-esdhc";

					reg = <0x70004000 0x4000>;

					interrupts = <1>;

					status = "disabled";

				};



				esdhc@70008000 { /* ESDHC2 */

				esdhc2: esdhc@70008000 {

					compatible = "fsl,imx51-esdhc";

					reg = <0x70008000 0x4000>;

					interrupts = <2>;

					bus-width = <4>;

					status = "disabled";

				};
@@ -97,7 +98,7 @@ 
					status = "disabled";

				};



				ecspi@70010000 { /* ECSPI1 */

				ecspi1: ecspi@70010000 {

					#address-cells = <1>;

					#size-cells = <0>;

					compatible = "fsl,imx51-ecspi";
@@ -115,43 +116,45 @@ 
					status = "disabled";

				};



				esdhc@70020000 { /* ESDHC3 */

				esdhc3: esdhc@70020000 {

					compatible = "fsl,imx51-esdhc";

					reg = <0x70020000 0x4000>;

					interrupts = <3>;

					bus-width = <4>;

					status = "disabled";

				};



				esdhc@70024000 { /* ESDHC4 */

				esdhc4: esdhc@70024000 {

					compatible = "fsl,imx51-esdhc";

					reg = <0x70024000 0x4000>;

					interrupts = <4>;

					bus-width = <4>;

					status = "disabled";

				};

			};



			usb@73f80000 {

			usbotg: usb@73f80000 {

				compatible = "fsl,imx51-usb", "fsl,imx27-usb";

				reg = <0x73f80000 0x0200>;

				interrupts = <18>;

				status = "disabled";

			};



			usb@73f80200 {

			usbh1: usb@73f80200 {

				compatible = "fsl,imx51-usb", "fsl,imx27-usb";

				reg = <0x73f80200 0x0200>;

				interrupts = <14>;

				status = "disabled";

			};



			usb@73f80400 {

			usbh2: usb@73f80400 {

				compatible = "fsl,imx51-usb", "fsl,imx27-usb";

				reg = <0x73f80400 0x0200>;

				interrupts = <16>;

				status = "disabled";

			};



			usb@73f80600 {

			usbh3: usb@73f80600 {

				compatible = "fsl,imx51-usb", "fsl,imx27-usb";

				reg = <0x73f80600 0x0200>;

				interrupts = <17>;
@@ -198,20 +201,20 @@ 
				#interrupt-cells = <2>;

			};



			wdog@73f98000 { /* WDOG1 */

			wdog1: wdog@73f98000 {

				compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";

				reg = <0x73f98000 0x4000>;

				interrupts = <58>;

			};



			wdog@73f9c000 { /* WDOG2 */

			wdog2: wdog@73f9c000 {

				compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";

				reg = <0x73f9c000 0x4000>;

				interrupts = <59>;

				status = "disabled";

			};



			iomuxc@73fa8000 {

			iomuxc: iomuxc@73fa8000 {

				compatible = "fsl,imx51-iomuxc";

				reg = <0x73fa8000 0x4000>;
@@ -349,7 +352,7 @@ 
			reg = <0x80000000 0x10000000>;

			ranges;



			ecspi@83fac000 { /* ECSPI2 */

			ecspi2: ecspi@83fac000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx51-ecspi";
@@ -358,14 +361,14 @@ 
				status = "disabled";

			};



			sdma@83fb0000 {

			sdma: sdma@83fb0000 {

				compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";

				reg = <0x83fb0000 0x4000>;

				interrupts = <6>;

				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin";

			};



			cspi@83fc0000 {

			cspi: cspi@83fc0000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx51-cspi", "fsl,imx35-cspi";
@@ -374,7 +377,7 @@ 
				status = "disabled";

			};



			i2c@83fc4000 { /* I2C2 */

			i2c2: i2c@83fc4000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";
@@ -383,7 +386,7 @@ 
				status = "disabled";

			};



			i2c@83fc8000 { /* I2C1 */

			i2c1: i2c@83fc8000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";
@@ -401,13 +404,13 @@ 
				status = "disabled";

			};



			audmux@83fd0000 {

			audmux: audmux@83fd0000 {

				compatible = "fsl,imx51-audmux", "fsl,imx31-audmux";

				reg = <0x83fd0000 0x4000>;

				status = "disabled";

			};



			nand@83fdb000 {

			nfc: nand@83fdb000 {

				compatible = "fsl,imx51-nand";

				reg = <0x83fdb000 0x1000 0xcfff0000 0x10000>;

				interrupts = <8>;
@@ -423,7 +426,7 @@ 
				status = "disabled";

			};



			ethernet@83fec000 {

			fec: ethernet@83fec000 {

				compatible = "fsl,imx51-fec", "fsl,imx27-fec";

				reg = <0x83fec000 0x4000>;

				interrupts = <87>;