Merge branch 'imx/dt/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6.git into next/dt2 (304ea747) · Commits · e / devices / android_kernel_fairphone_FP4

Shawn Guo <shawn.guo@linaro.org> writes: I chose to base it on Sascha's imx-common-clk series than -rc, because otherwise it will keep patching clock file that has been removed by imx-common-clk series. It also depends on imx-pinctrl pull-request I just sent to be functional. Note: when imx-common-clk and imx-pinctrl get merged together, the following files will have conflicts. But the conflicts should not be so hard to resolve. [arnd: resolved those merge conflicts by pulling pinctrl branch] * imx/dt: (24 commits) ARM: dts: imx53-qsb: enable audio support ARM: dts: imx51-babbage: enable audio support ARM: imx: add audio codec clk lookup for imx53-qsb ARM: imx: add audmux pad setting for imx51-babbage ARM: imx: add more imx5 ssi clocks ARM: dts: imx53-qsb: Add Dialog DA9053 PMIC support ARM: dts: imx6q-sabrelite: add serial2 pinctrl support ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000 ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000 ARM: imx6q: add ssi1_ipg clk_lookup ARM: dts: imx6q-sabrelite: add audmux pinctrl support ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support ARM: dts: imx6q-sabrelite: add audmux device ARM: dts: imx6q-sabrelite: add ssi device ARM: dts: imx6q-arm2: add pinctrl state for usdhc ARM: imx6: Add UART2 for low-level debug ARM: imx6q: register phy fixup only when CONFIG_PHYLIB is enabled ARM: imx6q: move imx6q_sabrelite specific code to a dedicated function ARM: dts: imx6q-sabrelite: Add SPI NOR support ARM: dts: Add basic support for imx6q-sabresd ... Pulls in imx/pinctrl and imx/clock as dependencies. Signed-off-by:

Arnd Bergmann <arnd@arndb.de>

Documentation/devicetree/bindings/arm/fsl.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,10 @@ i.MX6 Quad SABRE Lite Board
		Required root node properties:
		- compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";

		i.MX6 Quad SABRE Smart Device Board
		Required root node properties:
		- compatible = "fsl,imx6q-sabresd", "fsl,imx6q";

		Generic i.MX boards
		-------------------

Documentation/devicetree/bindings/net/fsl-fec.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ Optional properties:

		Example:

		fec@83fec000 {
		ethernet@83fec000 {
		compatible = "fsl,imx51-fec", "fsl,imx27-fec";
		reg = <0x83fec000 0x4000>;
		interrupts = <87>;

Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ Optional properties:

		Example:

		uart@73fbc000 {
		serial@73fbc000 {
		compatible = "fsl,imx51-uart", "fsl,imx21-uart";
		reg = <0x73fbc000 0x4000>;
		interrupts = <31>;

arch/arm/Kconfig.debug

+8 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,14 @@ 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"
		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

arch/arm/boot/dts/imx27-phytec-phycore.dts

+4 −4

Original line number	Diff line number	Diff line
		@@ -27,22 +27,22 @@
		status = "okay";
		};

		uart@1000a000 {
		serial@1000a000 {
		fsl,uart-has-rtscts;
		status = "okay";
		};

		uart@1000b000 {
		serial@1000b000 {
		fsl,uart-has-rtscts;
		status = "okay";
		};

		uart@1000c000 {
		serial@1000c000 {
		fsl,uart-has-rtscts;
		status = "okay";
		};

		fec@1002b000 {
		ethernet@1002b000 {
		status = "okay";
		};