linux-next: manual merge of the staging tree with the arm-soc tree

linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 5620 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
i.MX53: move common QSB nodes to new file") from the arm-soc tree and
commit 17b5001b5143 ("imx-drm: convert to componentised device support")
from the staging tree.

I fixed it up (see at bottom) and can carry the fix as necessary (no
action is required).  I also added the following fix up patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Feb 2014 17:07:01 +1100
Subject: [PATCH] ARM: dts: i.MX53: merge fix patch

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 2dca98b79f48..5dd37c7c38b8 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -17,7 +17,7 @@
 		reg = <0x70000000 0x40000000>;
 	};
 
-	display@di0 {
+	display0: display@di0 {
 		compatible = "fsl,imx-parallel-display";
 		crtcs = <&ipu 0>;
 		interface-pix-fmt = "rgb565";
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/imx53-qsb.dts
index dec4b073ceb1,3cb4f7791a91..000000000000
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@@ -16,6 -16,182 +16,11 @@@
  / {
  	model = "Freescale i.MX53 Quick Start Board";
  	compatible = "fsl,imx53-qsb", "fsl,imx53";
 -
 -	memory {
 -		reg = <0x70000000 0x40000000>;
 -	};
 -
 -	display0: display@di0 {
 -		compatible = "fsl,imx-parallel-display";
 -		crtcs = <&ipu 0>;
 -		interface-pix-fmt = "rgb565";
 -		pinctrl-names = "default";
 -		pinctrl-0 = <&pinctrl_ipu_disp0_1>;
 -		status = "disabled";
 -		display-timings {
 -			claawvga {
 -				native-mode;
 -				clock-frequency = <27000000>;
 -				hactive = <800>;
 -				vactive = <480>;
 -				hback-porch = <40>;
 -				hfront-porch = <60>;
 -				vback-porch = <10>;
 -				vfront-porch = <10>;
 -				hsync-len = <20>;
 -				vsync-len = <10>;
 -				hsync-active = <0>;
 -				vsync-active = <0>;
 -				de-active = <1>;
 -				pixelclk-active = <0>;
 -			};
 -		};
 -	};
 -
 -	gpio-keys {
 -		compatible = "gpio-keys";
 -
 -		power {
 -			label = "Power Button";
 -			gpios = <&gpio1 8 0>;
 -			linux,code = <116>; /* KEY_POWER */
 -		};
 -
 -		volume-up {
 -			label = "Volume Up";
 -			gpios = <&gpio2 14 0>;
 -			linux,code = <115>; /* KEY_VOLUMEUP */
 -			gpio-key,wakeup;
 -		};
 -
 -		volume-down {
 -			label = "Volume Down";
 -			gpios = <&gpio2 15 0>;
 -			linux,code = <114>; /* KEY_VOLUMEDOWN */
 -			gpio-key,wakeup;
 -		};
 -	};
 -
+ 	imx-drm {
+ 		compatible = "fsl,imx-drm";
+ 		crtcs = <&ipu 0>;
+ 		connectors = <&display0>;
+ 	};
 -
 -	leds {
 -		compatible = "gpio-leds";
 -		pinctrl-names = "default";
 -		pinctrl-0 = <&led_pin_gpio7_7>;
 -
 -		user {
 -			label = "Heartbeat";
 -			gpios = <&gpio7 7 0>;
 -			linux,default-trigger = "heartbeat";
 -		};
 -	};
 -
 -	regulators {
 -		compatible = "simple-bus";
 -
 -		reg_3p2v: 3p2v {
 -			compatible = "regulator-fixed";
 -			regulator-name = "3P2V";
 -			regulator-min-microvolt = <3200000>;
 -			regulator-max-microvolt = <3200000>;
 -			regulator-always-on;
 -		};
 -
 -		reg_usb_vbus: usb_vbus {
 -			compatible = "regulator-fixed";
 -			regulator-name = "usb_vbus";
 -			regulator-min-microvolt = <5000000>;
 -			regulator-max-microvolt = <5000000>;
 -			gpio = <&gpio7 8 0>;
 -			enable-active-high;
 -		};
 -	};
 -
 -	sound {
 -		compatible = "fsl,imx53-qsb-sgtl5000",
 -			     "fsl,imx-audio-sgtl5000";
 -		model = "imx53-qsb-sgtl5000";
 -		ssi-controller = <&ssi2>;
 -		audio-codec = <&sgtl5000>;
 -		audio-routing =
 -			"MIC_IN", "Mic Jack",
 -			"Mic Jack", "Mic Bias",
 -			"Headphone Jack", "HP_OUT";
 -		mux-int-port = <2>;
 -		mux-ext-port = <5>;
 -	};
 -};
 -
 -&esdhc1 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_esdhc1_1>;
 -	status = "okay";
 -};
 -
 -&ssi2 {
 -	fsl,mode = "i2s-slave";
 -	status = "okay";
 -};
 -
 -&esdhc3 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_esdhc3_1>;
 -	cd-gpios = <&gpio3 11 0>;
 -	wp-gpios = <&gpio3 12 0>;
 -	bus-width = <8>;
 -	status = "okay";
 -};
 -
 -&iomuxc {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_hog>;
 -
 -	hog {
 -		pinctrl_hog: hoggrp {
 -			fsl,pins = <
 -				MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
 -				MX53_PAD_GPIO_8__GPIO1_8          0x80000000
 -				MX53_PAD_PATA_DATA14__GPIO2_14    0x80000000
 -				MX53_PAD_PATA_DATA15__GPIO2_15    0x80000000
 -				MX53_PAD_EIM_DA11__GPIO3_11       0x80000000
 -				MX53_PAD_EIM_DA12__GPIO3_12       0x80000000
 -				MX53_PAD_PATA_DA_0__GPIO7_6       0x80000000
 -				MX53_PAD_PATA_DA_2__GPIO7_8	  0x80000000
 -				MX53_PAD_GPIO_16__GPIO7_11        0x80000000
 -			>;
 -		};
 -
 -		led_pin_gpio7_7: led_gpio7_7@0 {
 -			fsl,pins = <
 -				MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000
 -			>;
 -		};
 -	};
 -
 -};
 -
 -&uart1 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_uart1_1>;
 -	status = "okay";
 -};
 -
 -&i2c2 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_i2c2_1>;
 -	status = "okay";
 -
 -	sgtl5000: codec@0a {
 -		compatible = "fsl,sgtl5000";
 -		reg = <0x0a>;
 -		VDDA-supply = <&reg_3p2v>;
 -		VDDIO-supply = <&reg_3p2v>;
 -		clocks = <&clks 150>;
 -	};
  };
  
  &i2c1 {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
i.MX53: move common QSB nodes to new file") from the arm-soc tree and
commit 17b5001b5143 ("imx-drm: convert to componentised device support")
from the staging tree.

I fixed it up (see at bottom) and can carry the fix as necessary (no
action is required).  I also added the following fix up patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Feb 2014 17:07:01 +1100
Subject: [PATCH] ARM: dts: i.MX53: merge fix patch

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 2dca98b79f48..5dd37c7c38b8 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -17,7 +17,7 @@
 		reg = <0x70000000 0x40000000>;
 	};
 
-	display at di0 {
+	display0: display at di0 {
 		compatible = "fsl,imx-parallel-display";
 		crtcs = <&ipu 0>;
 		interface-pix-fmt = "rgb565";
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/boot/dts/imx53-qsb.dts
index dec4b073ceb1,3cb4f7791a91..000000000000
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@@ -16,6 -16,182 +16,11 @@@
  / {
  	model = "Freescale i.MX53 Quick Start Board";
  	compatible = "fsl,imx53-qsb", "fsl,imx53";
 -
 -	memory {
 -		reg = <0x70000000 0x40000000>;
 -	};
 -
 -	display0: display at di0 {
 -		compatible = "fsl,imx-parallel-display";
 -		crtcs = <&ipu 0>;
 -		interface-pix-fmt = "rgb565";
 -		pinctrl-names = "default";
 -		pinctrl-0 = <&pinctrl_ipu_disp0_1>;
 -		status = "disabled";
 -		display-timings {
 -			claawvga {
 -				native-mode;
 -				clock-frequency = <27000000>;
 -				hactive = <800>;
 -				vactive = <480>;
 -				hback-porch = <40>;
 -				hfront-porch = <60>;
 -				vback-porch = <10>;
 -				vfront-porch = <10>;
 -				hsync-len = <20>;
 -				vsync-len = <10>;
 -				hsync-active = <0>;
 -				vsync-active = <0>;
 -				de-active = <1>;
 -				pixelclk-active = <0>;
 -			};
 -		};
 -	};
 -
 -	gpio-keys {
 -		compatible = "gpio-keys";
 -
 -		power {
 -			label = "Power Button";
 -			gpios = <&gpio1 8 0>;
 -			linux,code = <116>; /* KEY_POWER */
 -		};
 -
 -		volume-up {
 -			label = "Volume Up";
 -			gpios = <&gpio2 14 0>;
 -			linux,code = <115>; /* KEY_VOLUMEUP */
 -			gpio-key,wakeup;
 -		};
 -
 -		volume-down {
 -			label = "Volume Down";
 -			gpios = <&gpio2 15 0>;
 -			linux,code = <114>; /* KEY_VOLUMEDOWN */
 -			gpio-key,wakeup;
 -		};
 -	};
 -
+ 	imx-drm {
+ 		compatible = "fsl,imx-drm";
+ 		crtcs = <&ipu 0>;
+ 		connectors = <&display0>;
+ 	};
 -
 -	leds {
 -		compatible = "gpio-leds";
 -		pinctrl-names = "default";
 -		pinctrl-0 = <&led_pin_gpio7_7>;
 -
 -		user {
 -			label = "Heartbeat";
 -			gpios = <&gpio7 7 0>;
 -			linux,default-trigger = "heartbeat";
 -		};
 -	};
 -
 -	regulators {
 -		compatible = "simple-bus";
 -
 -		reg_3p2v: 3p2v {
 -			compatible = "regulator-fixed";
 -			regulator-name = "3P2V";
 -			regulator-min-microvolt = <3200000>;
 -			regulator-max-microvolt = <3200000>;
 -			regulator-always-on;
 -		};
 -
 -		reg_usb_vbus: usb_vbus {
 -			compatible = "regulator-fixed";
 -			regulator-name = "usb_vbus";
 -			regulator-min-microvolt = <5000000>;
 -			regulator-max-microvolt = <5000000>;
 -			gpio = <&gpio7 8 0>;
 -			enable-active-high;
 -		};
 -	};
 -
 -	sound {
 -		compatible = "fsl,imx53-qsb-sgtl5000",
 -			     "fsl,imx-audio-sgtl5000";
 -		model = "imx53-qsb-sgtl5000";
 -		ssi-controller = <&ssi2>;
 -		audio-codec = <&sgtl5000>;
 -		audio-routing =
 -			"MIC_IN", "Mic Jack",
 -			"Mic Jack", "Mic Bias",
 -			"Headphone Jack", "HP_OUT";
 -		mux-int-port = <2>;
 -		mux-ext-port = <5>;
 -	};
 -};
 -
 -&esdhc1 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_esdhc1_1>;
 -	status = "okay";
 -};
 -
 -&ssi2 {
 -	fsl,mode = "i2s-slave";
 -	status = "okay";
 -};
 -
 -&esdhc3 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_esdhc3_1>;
 -	cd-gpios = <&gpio3 11 0>;
 -	wp-gpios = <&gpio3 12 0>;
 -	bus-width = <8>;
 -	status = "okay";
 -};
 -
 -&iomuxc {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_hog>;
 -
 -	hog {
 -		pinctrl_hog: hoggrp {
 -			fsl,pins = <
 -				MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
 -				MX53_PAD_GPIO_8__GPIO1_8          0x80000000
 -				MX53_PAD_PATA_DATA14__GPIO2_14    0x80000000
 -				MX53_PAD_PATA_DATA15__GPIO2_15    0x80000000
 -				MX53_PAD_EIM_DA11__GPIO3_11       0x80000000
 -				MX53_PAD_EIM_DA12__GPIO3_12       0x80000000
 -				MX53_PAD_PATA_DA_0__GPIO7_6       0x80000000
 -				MX53_PAD_PATA_DA_2__GPIO7_8	  0x80000000
 -				MX53_PAD_GPIO_16__GPIO7_11        0x80000000
 -			>;
 -		};
 -
 -		led_pin_gpio7_7: led_gpio7_7 at 0 {
 -			fsl,pins = <
 -				MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000
 -			>;
 -		};
 -	};
 -
 -};
 -
 -&uart1 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_uart1_1>;
 -	status = "okay";
 -};
 -
 -&i2c2 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_i2c2_1>;
 -	status = "okay";
 -
 -	sgtl5000: codec at 0a {
 -		compatible = "fsl,sgtl5000";
 -		reg = <0x0a>;
 -		VDDA-supply = <&reg_3p2v>;
 -		VDDIO-supply = <&reg_3p2v>;
 -		clocks = <&clks 150>;
 -	};
  };
  
  &i2c1 {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140225/d2987943/attachment-0001.sig>

linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 5620 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
i.MX53: move common QSB nodes to new file") from the arm-soc tree and
commit 17b5001b5143 ("imx-drm: convert to componentised device support")
from the staging tree.

I fixed it up (see at bottom) and can carry the fix as necessary (no
action is required).  I also added the following fix up patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Feb 2014 17:07:01 +1100
Subject: [PATCH] ARM: dts: i.MX53: merge fix patch

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 2dca98b79f48..5dd37c7c38b8 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -17,7 +17,7 @@
 		reg = <0x70000000 0x40000000>;
 	};
 
-	display@di0 {
+	display0: display@di0 {
 		compatible = "fsl,imx-parallel-display";
 		crtcs = <&ipu 0>;
 		interface-pix-fmt = "rgb565";
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/imx53-qsb.dts
index dec4b073ceb1,3cb4f7791a91..000000000000
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@@ -16,6 -16,182 +16,11 @@@
  / {
  	model = "Freescale i.MX53 Quick Start Board";
  	compatible = "fsl,imx53-qsb", "fsl,imx53";
 -
 -	memory {
 -		reg = <0x70000000 0x40000000>;
 -	};
 -
 -	display0: display@di0 {
 -		compatible = "fsl,imx-parallel-display";
 -		crtcs = <&ipu 0>;
 -		interface-pix-fmt = "rgb565";
 -		pinctrl-names = "default";
 -		pinctrl-0 = <&pinctrl_ipu_disp0_1>;
 -		status = "disabled";
 -		display-timings {
 -			claawvga {
 -				native-mode;
 -				clock-frequency = <27000000>;
 -				hactive = <800>;
 -				vactive = <480>;
 -				hback-porch = <40>;
 -				hfront-porch = <60>;
 -				vback-porch = <10>;
 -				vfront-porch = <10>;
 -				hsync-len = <20>;
 -				vsync-len = <10>;
 -				hsync-active = <0>;
 -				vsync-active = <0>;
 -				de-active = <1>;
 -				pixelclk-active = <0>;
 -			};
 -		};
 -	};
 -
 -	gpio-keys {
 -		compatible = "gpio-keys";
 -
 -		power {
 -			label = "Power Button";
 -			gpios = <&gpio1 8 0>;
 -			linux,code = <116>; /* KEY_POWER */
 -		};
 -
 -		volume-up {
 -			label = "Volume Up";
 -			gpios = <&gpio2 14 0>;
 -			linux,code = <115>; /* KEY_VOLUMEUP */
 -			gpio-key,wakeup;
 -		};
 -
 -		volume-down {
 -			label = "Volume Down";
 -			gpios = <&gpio2 15 0>;
 -			linux,code = <114>; /* KEY_VOLUMEDOWN */
 -			gpio-key,wakeup;
 -		};
 -	};
 -
+ 	imx-drm {
+ 		compatible = "fsl,imx-drm";
+ 		crtcs = <&ipu 0>;
+ 		connectors = <&display0>;
+ 	};
 -
 -	leds {
 -		compatible = "gpio-leds";
 -		pinctrl-names = "default";
 -		pinctrl-0 = <&led_pin_gpio7_7>;
 -
 -		user {
 -			label = "Heartbeat";
 -			gpios = <&gpio7 7 0>;
 -			linux,default-trigger = "heartbeat";
 -		};
 -	};
 -
 -	regulators {
 -		compatible = "simple-bus";
 -
 -		reg_3p2v: 3p2v {
 -			compatible = "regulator-fixed";
 -			regulator-name = "3P2V";
 -			regulator-min-microvolt = <3200000>;
 -			regulator-max-microvolt = <3200000>;
 -			regulator-always-on;
 -		};
 -
 -		reg_usb_vbus: usb_vbus {
 -			compatible = "regulator-fixed";
 -			regulator-name = "usb_vbus";
 -			regulator-min-microvolt = <5000000>;
 -			regulator-max-microvolt = <5000000>;
 -			gpio = <&gpio7 8 0>;
 -			enable-active-high;
 -		};
 -	};
 -
 -	sound {
 -		compatible = "fsl,imx53-qsb-sgtl5000",
 -			     "fsl,imx-audio-sgtl5000";
 -		model = "imx53-qsb-sgtl5000";
 -		ssi-controller = <&ssi2>;
 -		audio-codec = <&sgtl5000>;
 -		audio-routing =
 -			"MIC_IN", "Mic Jack",
 -			"Mic Jack", "Mic Bias",
 -			"Headphone Jack", "HP_OUT";
 -		mux-int-port = <2>;
 -		mux-ext-port = <5>;
 -	};
 -};
 -
 -&esdhc1 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_esdhc1_1>;
 -	status = "okay";
 -};
 -
 -&ssi2 {
 -	fsl,mode = "i2s-slave";
 -	status = "okay";
 -};
 -
 -&esdhc3 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_esdhc3_1>;
 -	cd-gpios = <&gpio3 11 0>;
 -	wp-gpios = <&gpio3 12 0>;
 -	bus-width = <8>;
 -	status = "okay";
 -};
 -
 -&iomuxc {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_hog>;
 -
 -	hog {
 -		pinctrl_hog: hoggrp {
 -			fsl,pins = <
 -				MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
 -				MX53_PAD_GPIO_8__GPIO1_8          0x80000000
 -				MX53_PAD_PATA_DATA14__GPIO2_14    0x80000000
 -				MX53_PAD_PATA_DATA15__GPIO2_15    0x80000000
 -				MX53_PAD_EIM_DA11__GPIO3_11       0x80000000
 -				MX53_PAD_EIM_DA12__GPIO3_12       0x80000000
 -				MX53_PAD_PATA_DA_0__GPIO7_6       0x80000000
 -				MX53_PAD_PATA_DA_2__GPIO7_8	  0x80000000
 -				MX53_PAD_GPIO_16__GPIO7_11        0x80000000
 -			>;
 -		};
 -
 -		led_pin_gpio7_7: led_gpio7_7@0 {
 -			fsl,pins = <
 -				MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000
 -			>;
 -		};
 -	};
 -
 -};
 -
 -&uart1 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_uart1_1>;
 -	status = "okay";
 -};
 -
 -&i2c2 {
 -	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_i2c2_1>;
 -	status = "okay";
 -
 -	sgtl5000: codec@0a {
 -		compatible = "fsl,sgtl5000";
 -		reg = <0x0a>;
 -		VDDA-supply = <&reg_3p2v>;
 -		VDDIO-supply = <&reg_3p2v>;
 -		clocks = <&clks 150>;
 -	};
  };
  
  &i2c1 {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the staging tree with the arm-soc tree

[Greg KH]

On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
> from the staging tree.
> 
> I fixed it up (see at bottom) and can carry the fix as necessary (no
> action is required).  I also added the following fix up patch:

I think it's right, but I really have no idea about any of these.  I'll
defer to Russell to ensure they are correct.

thanks,

greg k-h

linux-next: manual merge of the staging tree with the arm-soc tree

[Greg KH]

On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
> from the staging tree.
> 
> I fixed it up (see at bottom) and can carry the fix as necessary (no
> action is required).  I also added the following fix up patch:

I think it's right, but I really have no idea about any of these.  I'll
defer to Russell to ensure they are correct.

thanks,

greg k-h

Re: linux-next: manual merge of the staging tree with the arm-soc tree

[Olof Johansson]

On Tue, Feb 25, 2014 at 8:49 AM, Greg KH <greg@kroah.com> wrote:
> On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the staging tree got a conflict in
>> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
>> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
>> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
>> from the staging tree.
>>
>> I fixed it up (see at bottom) and can carry the fix as necessary (no
>> action is required).  I also added the following fix up patch:
>
> I think it's right, but I really have no idea about any of these.  I'll
> defer to Russell to ensure they are correct.

We normally merge all dts changes through arm-soc to avoid these kind
of conflicts. Since your tree is a stable one there isn't much to do
about it, but I'd appreciate it if we just got those parts of the
patch series in the future to avoid these situations. We've been bit
by it before.


-Olof

linux-next: manual merge of the staging tree with the arm-soc tree

[Olof Johansson]

On Tue, Feb 25, 2014 at 8:49 AM, Greg KH <greg@kroah.com> wrote:
> On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the staging tree got a conflict in
>> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
>> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
>> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
>> from the staging tree.
>>
>> I fixed it up (see at bottom) and can carry the fix as necessary (no
>> action is required).  I also added the following fix up patch:
>
> I think it's right, but I really have no idea about any of these.  I'll
> defer to Russell to ensure they are correct.

We normally merge all dts changes through arm-soc to avoid these kind
of conflicts. Since your tree is a stable one there isn't much to do
about it, but I'd appreciate it if we just got those parts of the
patch series in the future to avoid these situations. We've been bit
by it before.


-Olof

Re: linux-next: manual merge of the staging tree with the arm-soc tree

[Olof Johansson]

On Tue, Feb 25, 2014 at 8:49 AM, Greg KH <greg@kroah.com> wrote:
> On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the staging tree got a conflict in
>> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
>> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
>> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
>> from the staging tree.
>>
>> I fixed it up (see at bottom) and can carry the fix as necessary (no
>> action is required).  I also added the following fix up patch:
>
> I think it's right, but I really have no idea about any of these.  I'll
> defer to Russell to ensure they are correct.

We normally merge all dts changes through arm-soc to avoid these kind
of conflicts. Since your tree is a stable one there isn't much to do
about it, but I'd appreciate it if we just got those parts of the
patch series in the future to avoid these situations. We've been bit
by it before.


-Olof

Re: linux-next: manual merge of the staging tree with the arm-soc tree

[Greg KH]

On Tue, Feb 25, 2014 at 08:51:37AM -0800, Olof Johansson wrote:
> On Tue, Feb 25, 2014 at 8:49 AM, Greg KH <greg@kroah.com> wrote:
> > On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the staging tree got a conflict in
> >> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
> >> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
> >> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
> >> from the staging tree.
> >>
> >> I fixed it up (see at bottom) and can carry the fix as necessary (no
> >> action is required).  I also added the following fix up patch:
> >
> > I think it's right, but I really have no idea about any of these.  I'll
> > defer to Russell to ensure they are correct.
> 
> We normally merge all dts changes through arm-soc to avoid these kind
> of conflicts. Since your tree is a stable one there isn't much to do
> about it, but I'd appreciate it if we just got those parts of the
> patch series in the future to avoid these situations. We've been bit
> by it before.

I can revert these patches, but for some reason Russell said they should
go through this one, so I took them...

Russell, thoughts?

linux-next: manual merge of the staging tree with the arm-soc tree

[Greg KH]

On Tue, Feb 25, 2014 at 08:51:37AM -0800, Olof Johansson wrote:
> On Tue, Feb 25, 2014 at 8:49 AM, Greg KH <greg@kroah.com> wrote:
> > On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the staging tree got a conflict in
> >> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
> >> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
> >> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
> >> from the staging tree.
> >>
> >> I fixed it up (see at bottom) and can carry the fix as necessary (no
> >> action is required).  I also added the following fix up patch:
> >
> > I think it's right, but I really have no idea about any of these.  I'll
> > defer to Russell to ensure they are correct.
> 
> We normally merge all dts changes through arm-soc to avoid these kind
> of conflicts. Since your tree is a stable one there isn't much to do
> about it, but I'd appreciate it if we just got those parts of the
> patch series in the future to avoid these situations. We've been bit
> by it before.

I can revert these patches, but for some reason Russell said they should
go through this one, so I took them...

Russell, thoughts?

Re: linux-next: manual merge of the staging tree with the arm-soc tree

[Greg KH]

On Tue, Feb 25, 2014 at 08:51:37AM -0800, Olof Johansson wrote:
> On Tue, Feb 25, 2014 at 8:49 AM, Greg KH <greg@kroah.com> wrote:
> > On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the staging tree got a conflict in
> >> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
> >> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
> >> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
> >> from the staging tree.
> >>
> >> I fixed it up (see at bottom) and can carry the fix as necessary (no
> >> action is required).  I also added the following fix up patch:
> >
> > I think it's right, but I really have no idea about any of these.  I'll
> > defer to Russell to ensure they are correct.
> 
> We normally merge all dts changes through arm-soc to avoid these kind
> of conflicts. Since your tree is a stable one there isn't much to do
> about it, but I'd appreciate it if we just got those parts of the
> patch series in the future to avoid these situations. We've been bit
> by it before.

I can revert these patches, but for some reason Russell said they should
go through this one, so I took them...

Russell, thoughts?

Re: linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 6317 bytes --]

Hi all,

On Tue, 25 Feb 2014 17:09:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the staging tree got a conflict in
> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
> from the staging tree.

These merge fixups are now required when the arm-soc tree is merged with
Linus' tree.

> I fixed it up (see at bottom) and can carry the fix as necessary (no
> action is required).  I also added the following fix up patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 25 Feb 2014 17:07:01 +1100
> Subject: [PATCH] ARM: dts: i.MX53: merge fix patch
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
> index 2dca98b79f48..5dd37c7c38b8 100644
> --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
> +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
> @@ -17,7 +17,7 @@
>  		reg = <0x70000000 0x40000000>;
>  	};
>  
> -	display@di0 {
> +	display0: display@di0 {
>  		compatible = "fsl,imx-parallel-display";
>  		crtcs = <&ipu 0>;
>  		interface-pix-fmt = "rgb565";
> -- 
> 1.9.0
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/boot/dts/imx53-qsb.dts
> index dec4b073ceb1,3cb4f7791a91..000000000000
> --- a/arch/arm/boot/dts/imx53-qsb.dts
> +++ b/arch/arm/boot/dts/imx53-qsb.dts
> @@@ -16,6 -16,182 +16,11 @@@
>   / {
>   	model = "Freescale i.MX53 Quick Start Board";
>   	compatible = "fsl,imx53-qsb", "fsl,imx53";
>  -
>  -	memory {
>  -		reg = <0x70000000 0x40000000>;
>  -	};
>  -
>  -	display0: display@di0 {
>  -		compatible = "fsl,imx-parallel-display";
>  -		crtcs = <&ipu 0>;
>  -		interface-pix-fmt = "rgb565";
>  -		pinctrl-names = "default";
>  -		pinctrl-0 = <&pinctrl_ipu_disp0_1>;
>  -		status = "disabled";
>  -		display-timings {
>  -			claawvga {
>  -				native-mode;
>  -				clock-frequency = <27000000>;
>  -				hactive = <800>;
>  -				vactive = <480>;
>  -				hback-porch = <40>;
>  -				hfront-porch = <60>;
>  -				vback-porch = <10>;
>  -				vfront-porch = <10>;
>  -				hsync-len = <20>;
>  -				vsync-len = <10>;
>  -				hsync-active = <0>;
>  -				vsync-active = <0>;
>  -				de-active = <1>;
>  -				pixelclk-active = <0>;
>  -			};
>  -		};
>  -	};
>  -
>  -	gpio-keys {
>  -		compatible = "gpio-keys";
>  -
>  -		power {
>  -			label = "Power Button";
>  -			gpios = <&gpio1 8 0>;
>  -			linux,code = <116>; /* KEY_POWER */
>  -		};
>  -
>  -		volume-up {
>  -			label = "Volume Up";
>  -			gpios = <&gpio2 14 0>;
>  -			linux,code = <115>; /* KEY_VOLUMEUP */
>  -			gpio-key,wakeup;
>  -		};
>  -
>  -		volume-down {
>  -			label = "Volume Down";
>  -			gpios = <&gpio2 15 0>;
>  -			linux,code = <114>; /* KEY_VOLUMEDOWN */
>  -			gpio-key,wakeup;
>  -		};
>  -	};
>  -
> + 	imx-drm {
> + 		compatible = "fsl,imx-drm";
> + 		crtcs = <&ipu 0>;
> + 		connectors = <&display0>;
> + 	};
>  -
>  -	leds {
>  -		compatible = "gpio-leds";
>  -		pinctrl-names = "default";
>  -		pinctrl-0 = <&led_pin_gpio7_7>;
>  -
>  -		user {
>  -			label = "Heartbeat";
>  -			gpios = <&gpio7 7 0>;
>  -			linux,default-trigger = "heartbeat";
>  -		};
>  -	};
>  -
>  -	regulators {
>  -		compatible = "simple-bus";
>  -
>  -		reg_3p2v: 3p2v {
>  -			compatible = "regulator-fixed";
>  -			regulator-name = "3P2V";
>  -			regulator-min-microvolt = <3200000>;
>  -			regulator-max-microvolt = <3200000>;
>  -			regulator-always-on;
>  -		};
>  -
>  -		reg_usb_vbus: usb_vbus {
>  -			compatible = "regulator-fixed";
>  -			regulator-name = "usb_vbus";
>  -			regulator-min-microvolt = <5000000>;
>  -			regulator-max-microvolt = <5000000>;
>  -			gpio = <&gpio7 8 0>;
>  -			enable-active-high;
>  -		};
>  -	};
>  -
>  -	sound {
>  -		compatible = "fsl,imx53-qsb-sgtl5000",
>  -			     "fsl,imx-audio-sgtl5000";
>  -		model = "imx53-qsb-sgtl5000";
>  -		ssi-controller = <&ssi2>;
>  -		audio-codec = <&sgtl5000>;
>  -		audio-routing =
>  -			"MIC_IN", "Mic Jack",
>  -			"Mic Jack", "Mic Bias",
>  -			"Headphone Jack", "HP_OUT";
>  -		mux-int-port = <2>;
>  -		mux-ext-port = <5>;
>  -	};
>  -};
>  -
>  -&esdhc1 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_esdhc1_1>;
>  -	status = "okay";
>  -};
>  -
>  -&ssi2 {
>  -	fsl,mode = "i2s-slave";
>  -	status = "okay";
>  -};
>  -
>  -&esdhc3 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_esdhc3_1>;
>  -	cd-gpios = <&gpio3 11 0>;
>  -	wp-gpios = <&gpio3 12 0>;
>  -	bus-width = <8>;
>  -	status = "okay";
>  -};
>  -
>  -&iomuxc {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_hog>;
>  -
>  -	hog {
>  -		pinctrl_hog: hoggrp {
>  -			fsl,pins = <
>  -				MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
>  -				MX53_PAD_GPIO_8__GPIO1_8          0x80000000
>  -				MX53_PAD_PATA_DATA14__GPIO2_14    0x80000000
>  -				MX53_PAD_PATA_DATA15__GPIO2_15    0x80000000
>  -				MX53_PAD_EIM_DA11__GPIO3_11       0x80000000
>  -				MX53_PAD_EIM_DA12__GPIO3_12       0x80000000
>  -				MX53_PAD_PATA_DA_0__GPIO7_6       0x80000000
>  -				MX53_PAD_PATA_DA_2__GPIO7_8	  0x80000000
>  -				MX53_PAD_GPIO_16__GPIO7_11        0x80000000
>  -			>;
>  -		};
>  -
>  -		led_pin_gpio7_7: led_gpio7_7@0 {
>  -			fsl,pins = <
>  -				MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000
>  -			>;
>  -		};
>  -	};
>  -
>  -};
>  -
>  -&uart1 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_uart1_1>;
>  -	status = "okay";
>  -};
>  -
>  -&i2c2 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_i2c2_1>;
>  -	status = "okay";
>  -
>  -	sgtl5000: codec@0a {
>  -		compatible = "fsl,sgtl5000";
>  -		reg = <0x0a>;
>  -		VDDA-supply = <&reg_3p2v>;
>  -		VDDIO-supply = <&reg_3p2v>;
>  -		clocks = <&clks 150>;
>  -	};
>   };
>   
>   &i2c1 {

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

Hi all,

On Tue, 25 Feb 2014 17:09:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the staging tree got a conflict in
> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
> from the staging tree.

These merge fixups are now required when the arm-soc tree is merged with
Linus' tree.

> I fixed it up (see at bottom) and can carry the fix as necessary (no
> action is required).  I also added the following fix up patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 25 Feb 2014 17:07:01 +1100
> Subject: [PATCH] ARM: dts: i.MX53: merge fix patch
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
> index 2dca98b79f48..5dd37c7c38b8 100644
> --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
> +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
> @@ -17,7 +17,7 @@
>  		reg = <0x70000000 0x40000000>;
>  	};
>  
> -	display at di0 {
> +	display0: display at di0 {
>  		compatible = "fsl,imx-parallel-display";
>  		crtcs = <&ipu 0>;
>  		interface-pix-fmt = "rgb565";
> -- 
> 1.9.0
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr at canb.auug.org.au
> 
> diff --cc arch/arm/boot/dts/imx53-qsb.dts
> index dec4b073ceb1,3cb4f7791a91..000000000000
> --- a/arch/arm/boot/dts/imx53-qsb.dts
> +++ b/arch/arm/boot/dts/imx53-qsb.dts
> @@@ -16,6 -16,182 +16,11 @@@
>   / {
>   	model = "Freescale i.MX53 Quick Start Board";
>   	compatible = "fsl,imx53-qsb", "fsl,imx53";
>  -
>  -	memory {
>  -		reg = <0x70000000 0x40000000>;
>  -	};
>  -
>  -	display0: display at di0 {
>  -		compatible = "fsl,imx-parallel-display";
>  -		crtcs = <&ipu 0>;
>  -		interface-pix-fmt = "rgb565";
>  -		pinctrl-names = "default";
>  -		pinctrl-0 = <&pinctrl_ipu_disp0_1>;
>  -		status = "disabled";
>  -		display-timings {
>  -			claawvga {
>  -				native-mode;
>  -				clock-frequency = <27000000>;
>  -				hactive = <800>;
>  -				vactive = <480>;
>  -				hback-porch = <40>;
>  -				hfront-porch = <60>;
>  -				vback-porch = <10>;
>  -				vfront-porch = <10>;
>  -				hsync-len = <20>;
>  -				vsync-len = <10>;
>  -				hsync-active = <0>;
>  -				vsync-active = <0>;
>  -				de-active = <1>;
>  -				pixelclk-active = <0>;
>  -			};
>  -		};
>  -	};
>  -
>  -	gpio-keys {
>  -		compatible = "gpio-keys";
>  -
>  -		power {
>  -			label = "Power Button";
>  -			gpios = <&gpio1 8 0>;
>  -			linux,code = <116>; /* KEY_POWER */
>  -		};
>  -
>  -		volume-up {
>  -			label = "Volume Up";
>  -			gpios = <&gpio2 14 0>;
>  -			linux,code = <115>; /* KEY_VOLUMEUP */
>  -			gpio-key,wakeup;
>  -		};
>  -
>  -		volume-down {
>  -			label = "Volume Down";
>  -			gpios = <&gpio2 15 0>;
>  -			linux,code = <114>; /* KEY_VOLUMEDOWN */
>  -			gpio-key,wakeup;
>  -		};
>  -	};
>  -
> + 	imx-drm {
> + 		compatible = "fsl,imx-drm";
> + 		crtcs = <&ipu 0>;
> + 		connectors = <&display0>;
> + 	};
>  -
>  -	leds {
>  -		compatible = "gpio-leds";
>  -		pinctrl-names = "default";
>  -		pinctrl-0 = <&led_pin_gpio7_7>;
>  -
>  -		user {
>  -			label = "Heartbeat";
>  -			gpios = <&gpio7 7 0>;
>  -			linux,default-trigger = "heartbeat";
>  -		};
>  -	};
>  -
>  -	regulators {
>  -		compatible = "simple-bus";
>  -
>  -		reg_3p2v: 3p2v {
>  -			compatible = "regulator-fixed";
>  -			regulator-name = "3P2V";
>  -			regulator-min-microvolt = <3200000>;
>  -			regulator-max-microvolt = <3200000>;
>  -			regulator-always-on;
>  -		};
>  -
>  -		reg_usb_vbus: usb_vbus {
>  -			compatible = "regulator-fixed";
>  -			regulator-name = "usb_vbus";
>  -			regulator-min-microvolt = <5000000>;
>  -			regulator-max-microvolt = <5000000>;
>  -			gpio = <&gpio7 8 0>;
>  -			enable-active-high;
>  -		};
>  -	};
>  -
>  -	sound {
>  -		compatible = "fsl,imx53-qsb-sgtl5000",
>  -			     "fsl,imx-audio-sgtl5000";
>  -		model = "imx53-qsb-sgtl5000";
>  -		ssi-controller = <&ssi2>;
>  -		audio-codec = <&sgtl5000>;
>  -		audio-routing =
>  -			"MIC_IN", "Mic Jack",
>  -			"Mic Jack", "Mic Bias",
>  -			"Headphone Jack", "HP_OUT";
>  -		mux-int-port = <2>;
>  -		mux-ext-port = <5>;
>  -	};
>  -};
>  -
>  -&esdhc1 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_esdhc1_1>;
>  -	status = "okay";
>  -};
>  -
>  -&ssi2 {
>  -	fsl,mode = "i2s-slave";
>  -	status = "okay";
>  -};
>  -
>  -&esdhc3 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_esdhc3_1>;
>  -	cd-gpios = <&gpio3 11 0>;
>  -	wp-gpios = <&gpio3 12 0>;
>  -	bus-width = <8>;
>  -	status = "okay";
>  -};
>  -
>  -&iomuxc {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_hog>;
>  -
>  -	hog {
>  -		pinctrl_hog: hoggrp {
>  -			fsl,pins = <
>  -				MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
>  -				MX53_PAD_GPIO_8__GPIO1_8          0x80000000
>  -				MX53_PAD_PATA_DATA14__GPIO2_14    0x80000000
>  -				MX53_PAD_PATA_DATA15__GPIO2_15    0x80000000
>  -				MX53_PAD_EIM_DA11__GPIO3_11       0x80000000
>  -				MX53_PAD_EIM_DA12__GPIO3_12       0x80000000
>  -				MX53_PAD_PATA_DA_0__GPIO7_6       0x80000000
>  -				MX53_PAD_PATA_DA_2__GPIO7_8	  0x80000000
>  -				MX53_PAD_GPIO_16__GPIO7_11        0x80000000
>  -			>;
>  -		};
>  -
>  -		led_pin_gpio7_7: led_gpio7_7 at 0 {
>  -			fsl,pins = <
>  -				MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000
>  -			>;
>  -		};
>  -	};
>  -
>  -};
>  -
>  -&uart1 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_uart1_1>;
>  -	status = "okay";
>  -};
>  -
>  -&i2c2 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_i2c2_1>;
>  -	status = "okay";
>  -
>  -	sgtl5000: codec at 0a {
>  -		compatible = "fsl,sgtl5000";
>  -		reg = <0x0a>;
>  -		VDDA-supply = <&reg_3p2v>;
>  -		VDDIO-supply = <&reg_3p2v>;
>  -		clocks = <&clks 150>;
>  -	};
>   };
>   
>   &i2c1 {

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140402/3610c939/attachment-0001.sig>

Re: linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 6317 bytes --]

Hi all,

On Tue, 25 Feb 2014 17:09:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the staging tree got a conflict in
> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
> from the staging tree.

These merge fixups are now required when the arm-soc tree is merged with
Linus' tree.

> I fixed it up (see at bottom) and can carry the fix as necessary (no
> action is required).  I also added the following fix up patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 25 Feb 2014 17:07:01 +1100
> Subject: [PATCH] ARM: dts: i.MX53: merge fix patch
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
> index 2dca98b79f48..5dd37c7c38b8 100644
> --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
> +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
> @@ -17,7 +17,7 @@
>  		reg = <0x70000000 0x40000000>;
>  	};
>  
> -	display@di0 {
> +	display0: display@di0 {
>  		compatible = "fsl,imx-parallel-display";
>  		crtcs = <&ipu 0>;
>  		interface-pix-fmt = "rgb565";
> -- 
> 1.9.0
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/boot/dts/imx53-qsb.dts
> index dec4b073ceb1,3cb4f7791a91..000000000000
> --- a/arch/arm/boot/dts/imx53-qsb.dts
> +++ b/arch/arm/boot/dts/imx53-qsb.dts
> @@@ -16,6 -16,182 +16,11 @@@
>   / {
>   	model = "Freescale i.MX53 Quick Start Board";
>   	compatible = "fsl,imx53-qsb", "fsl,imx53";
>  -
>  -	memory {
>  -		reg = <0x70000000 0x40000000>;
>  -	};
>  -
>  -	display0: display@di0 {
>  -		compatible = "fsl,imx-parallel-display";
>  -		crtcs = <&ipu 0>;
>  -		interface-pix-fmt = "rgb565";
>  -		pinctrl-names = "default";
>  -		pinctrl-0 = <&pinctrl_ipu_disp0_1>;
>  -		status = "disabled";
>  -		display-timings {
>  -			claawvga {
>  -				native-mode;
>  -				clock-frequency = <27000000>;
>  -				hactive = <800>;
>  -				vactive = <480>;
>  -				hback-porch = <40>;
>  -				hfront-porch = <60>;
>  -				vback-porch = <10>;
>  -				vfront-porch = <10>;
>  -				hsync-len = <20>;
>  -				vsync-len = <10>;
>  -				hsync-active = <0>;
>  -				vsync-active = <0>;
>  -				de-active = <1>;
>  -				pixelclk-active = <0>;
>  -			};
>  -		};
>  -	};
>  -
>  -	gpio-keys {
>  -		compatible = "gpio-keys";
>  -
>  -		power {
>  -			label = "Power Button";
>  -			gpios = <&gpio1 8 0>;
>  -			linux,code = <116>; /* KEY_POWER */
>  -		};
>  -
>  -		volume-up {
>  -			label = "Volume Up";
>  -			gpios = <&gpio2 14 0>;
>  -			linux,code = <115>; /* KEY_VOLUMEUP */
>  -			gpio-key,wakeup;
>  -		};
>  -
>  -		volume-down {
>  -			label = "Volume Down";
>  -			gpios = <&gpio2 15 0>;
>  -			linux,code = <114>; /* KEY_VOLUMEDOWN */
>  -			gpio-key,wakeup;
>  -		};
>  -	};
>  -
> + 	imx-drm {
> + 		compatible = "fsl,imx-drm";
> + 		crtcs = <&ipu 0>;
> + 		connectors = <&display0>;
> + 	};
>  -
>  -	leds {
>  -		compatible = "gpio-leds";
>  -		pinctrl-names = "default";
>  -		pinctrl-0 = <&led_pin_gpio7_7>;
>  -
>  -		user {
>  -			label = "Heartbeat";
>  -			gpios = <&gpio7 7 0>;
>  -			linux,default-trigger = "heartbeat";
>  -		};
>  -	};
>  -
>  -	regulators {
>  -		compatible = "simple-bus";
>  -
>  -		reg_3p2v: 3p2v {
>  -			compatible = "regulator-fixed";
>  -			regulator-name = "3P2V";
>  -			regulator-min-microvolt = <3200000>;
>  -			regulator-max-microvolt = <3200000>;
>  -			regulator-always-on;
>  -		};
>  -
>  -		reg_usb_vbus: usb_vbus {
>  -			compatible = "regulator-fixed";
>  -			regulator-name = "usb_vbus";
>  -			regulator-min-microvolt = <5000000>;
>  -			regulator-max-microvolt = <5000000>;
>  -			gpio = <&gpio7 8 0>;
>  -			enable-active-high;
>  -		};
>  -	};
>  -
>  -	sound {
>  -		compatible = "fsl,imx53-qsb-sgtl5000",
>  -			     "fsl,imx-audio-sgtl5000";
>  -		model = "imx53-qsb-sgtl5000";
>  -		ssi-controller = <&ssi2>;
>  -		audio-codec = <&sgtl5000>;
>  -		audio-routing =
>  -			"MIC_IN", "Mic Jack",
>  -			"Mic Jack", "Mic Bias",
>  -			"Headphone Jack", "HP_OUT";
>  -		mux-int-port = <2>;
>  -		mux-ext-port = <5>;
>  -	};
>  -};
>  -
>  -&esdhc1 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_esdhc1_1>;
>  -	status = "okay";
>  -};
>  -
>  -&ssi2 {
>  -	fsl,mode = "i2s-slave";
>  -	status = "okay";
>  -};
>  -
>  -&esdhc3 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_esdhc3_1>;
>  -	cd-gpios = <&gpio3 11 0>;
>  -	wp-gpios = <&gpio3 12 0>;
>  -	bus-width = <8>;
>  -	status = "okay";
>  -};
>  -
>  -&iomuxc {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_hog>;
>  -
>  -	hog {
>  -		pinctrl_hog: hoggrp {
>  -			fsl,pins = <
>  -				MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
>  -				MX53_PAD_GPIO_8__GPIO1_8          0x80000000
>  -				MX53_PAD_PATA_DATA14__GPIO2_14    0x80000000
>  -				MX53_PAD_PATA_DATA15__GPIO2_15    0x80000000
>  -				MX53_PAD_EIM_DA11__GPIO3_11       0x80000000
>  -				MX53_PAD_EIM_DA12__GPIO3_12       0x80000000
>  -				MX53_PAD_PATA_DA_0__GPIO7_6       0x80000000
>  -				MX53_PAD_PATA_DA_2__GPIO7_8	  0x80000000
>  -				MX53_PAD_GPIO_16__GPIO7_11        0x80000000
>  -			>;
>  -		};
>  -
>  -		led_pin_gpio7_7: led_gpio7_7@0 {
>  -			fsl,pins = <
>  -				MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000
>  -			>;
>  -		};
>  -	};
>  -
>  -};
>  -
>  -&uart1 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_uart1_1>;
>  -	status = "okay";
>  -};
>  -
>  -&i2c2 {
>  -	pinctrl-names = "default";
>  -	pinctrl-0 = <&pinctrl_i2c2_1>;
>  -	status = "okay";
>  -
>  -	sgtl5000: codec@0a {
>  -		compatible = "fsl,sgtl5000";
>  -		reg = <0x0a>;
>  -		VDDA-supply = <&reg_3p2v>;
>  -		VDDIO-supply = <&reg_3p2v>;
>  -		clocks = <&clks 150>;
>  -	};
>   };
>   
>   &i2c1 {

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx53-mba53.dts between commit a4a2aa9b038c ("ARM: dts:
imx53-mba53: create a container for fixed regulators") from the arm-soc
tree and commit 17b5001b5143 ("imx-drm: convert to componentised device
support") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/imx53-mba53.dts
index 55af11037a00,9b6e76980a74..000000000000
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
@@@ -35,27 -43,18 +35,33 @@@
  		status = "disabled";
  	};
  
+ 	imx-drm {
+ 		compatible = "fsl,imx-drm";
+ 		crtcs = <&ipu 1>;
+ 		connectors = <&disp1>, <&tve>;
+ 	};
+ 
 -	reg_3p2v: 3p2v {
 -		compatible = "regulator-fixed";
 -		regulator-name = "3P2V";
 -		regulator-min-microvolt = <3200000>;
 -		regulator-max-microvolt = <3200000>;
 -		regulator-always-on;
 +	regulators {
 +		compatible = "simple-bus";
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +
 +		reg_backlight: regulator@0 {
 +			compatible = "regulator-fixed";
 +			reg = <0>;
 +			regulator-name = "lcd-supply";
 +			gpio = <&gpio2 5 0>;
 +			startup-delay-us = <5000>;
 +		};
 +
 +		reg_3p2v: regulator@1 {
 +			compatible = "regulator-fixed";
 +			reg = <1>;
 +			regulator-name = "3P2V";
 +			regulator-min-microvolt = <3200000>;
 +			regulator-max-microvolt = <3200000>;
 +			regulator-always-on;
 +		};
  	};
  
  	sound {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx53-mba53.dts between commit a4a2aa9b038c ("ARM: dts:
imx53-mba53: create a container for fixed regulators") from the arm-soc
tree and commit 17b5001b5143 ("imx-drm: convert to componentised device
support") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/boot/dts/imx53-mba53.dts
index 55af11037a00,9b6e76980a74..000000000000
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
@@@ -35,27 -43,18 +35,33 @@@
  		status = "disabled";
  	};
  
+ 	imx-drm {
+ 		compatible = "fsl,imx-drm";
+ 		crtcs = <&ipu 1>;
+ 		connectors = <&disp1>, <&tve>;
+ 	};
+ 
 -	reg_3p2v: 3p2v {
 -		compatible = "regulator-fixed";
 -		regulator-name = "3P2V";
 -		regulator-min-microvolt = <3200000>;
 -		regulator-max-microvolt = <3200000>;
 -		regulator-always-on;
 +	regulators {
 +		compatible = "simple-bus";
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +
 +		reg_backlight: regulator at 0 {
 +			compatible = "regulator-fixed";
 +			reg = <0>;
 +			regulator-name = "lcd-supply";
 +			gpio = <&gpio2 5 0>;
 +			startup-delay-us = <5000>;
 +		};
 +
 +		reg_3p2v: regulator at 1 {
 +			compatible = "regulator-fixed";
 +			reg = <1>;
 +			regulator-name = "3P2V";
 +			regulator-min-microvolt = <3200000>;
 +			regulator-max-microvolt = <3200000>;
 +			regulator-always-on;
 +		};
  	};
  
  	sound {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140225/7a9ed161/attachment-0001.sig>

linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx53-mba53.dts between commit a4a2aa9b038c ("ARM: dts:
imx53-mba53: create a container for fixed regulators") from the arm-soc
tree and commit 17b5001b5143 ("imx-drm: convert to componentised device
support") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/imx53-mba53.dts
index 55af11037a00,9b6e76980a74..000000000000
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
@@@ -35,27 -43,18 +35,33 @@@
  		status = "disabled";
  	};
  
+ 	imx-drm {
+ 		compatible = "fsl,imx-drm";
+ 		crtcs = <&ipu 1>;
+ 		connectors = <&disp1>, <&tve>;
+ 	};
+ 
 -	reg_3p2v: 3p2v {
 -		compatible = "regulator-fixed";
 -		regulator-name = "3P2V";
 -		regulator-min-microvolt = <3200000>;
 -		regulator-max-microvolt = <3200000>;
 -		regulator-always-on;
 +	regulators {
 +		compatible = "simple-bus";
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +
 +		reg_backlight: regulator@0 {
 +			compatible = "regulator-fixed";
 +			reg = <0>;
 +			regulator-name = "lcd-supply";
 +			gpio = <&gpio2 5 0>;
 +			startup-delay-us = <5000>;
 +		};
 +
 +		reg_3p2v: regulator@1 {
 +			compatible = "regulator-fixed";
 +			reg = <1>;
 +			regulator-name = "3P2V";
 +			regulator-min-microvolt = <3200000>;
 +			regulator-max-microvolt = <3200000>;
 +			regulator-always-on;
 +		};
  	};
  
  	sound {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2303 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
Documentation/devicetree/bindings/iio/adc/at91_adc.txt between commit
b5303ffbcf11 ("Documentation: dt: iio: improve atmel-adc documentation")
from the arm-soc tree and commit 1a5b7d41f8f6 ("iio: at91: document ADC
clock properties") from the staging tree.

[This file is renamed from
Documentation/devicetree/bindings/arm/atmel-adc.txt in the arm-soc tree.]

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc Documentation/devicetree/bindings/iio/adc/at91_adc.txt
index 82061c7e4fea,9a1175b46f49..000000000000
--- a/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
@@@ -5,7 -5,10 +5,10 @@@ Required properties
      <chip> can be "at91sam9260", "at91sam9g45" or "at91sam9x5"
    - reg: Should contain ADC registers location and length
    - interrupts: Should contain the IRQ line for the ADC
+   - clock-names: tuple listing input clock names.
+ 	Required elements: "adc_clk", "adc_op_clk".
+   - clocks: phandles to input clocks.
 -  - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this
 +  - atmel,adc-channels-used: Bitmask of the channels muxed and enabled for this
      device
    - atmel,adc-startup-time: Startup Time of the ADC in microseconds as
      defined in the datasheet
@@@ -41,14 -44,19 +44,16 @@@ Optional trigger Nodes
  
  Examples:
  adc0: adc@fffb0000 {
 +	#address-cells = <1>;
 +	#size-cells = <0>;
  	compatible = "atmel,at91sam9260-adc";
  	reg = <0xfffb0000 0x100>;
 -	interrupts = <20 4>;
 +	interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
+ 	clocks = <&adc_clk>, <&adc_op_clk>;
+ 	clock-names = "adc_clk", "adc_op_clk";
 -	atmel,adc-channel-base = <0x30>;
  	atmel,adc-channels-used = <0xff>;
 -	atmel,adc-drdy-mask = <0x10000>;
 -	atmel,adc-num-channels = <8>;
  	atmel,adc-startup-time = <40>;
 -	atmel,adc-status-register = <0x1c>;
 -	atmel,adc-trigger-register = <0x08>;
 -	atmel,adc-use-external;
 +	atmel,adc-use-external-triggers;
  	atmel,adc-vref = <3300>;
  	atmel,adc-res = <8 10>;
  	atmel,adc-res-names = "lowres", "highres";

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
Documentation/devicetree/bindings/iio/adc/at91_adc.txt between commit
b5303ffbcf11 ("Documentation: dt: iio: improve atmel-adc documentation")
from the arm-soc tree and commit 1a5b7d41f8f6 ("iio: at91: document ADC
clock properties") from the staging tree.

[This file is renamed from
Documentation/devicetree/bindings/arm/atmel-adc.txt in the arm-soc tree.]

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc Documentation/devicetree/bindings/iio/adc/at91_adc.txt
index 82061c7e4fea,9a1175b46f49..000000000000
--- a/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
@@@ -5,7 -5,10 +5,10 @@@ Required properties
      <chip> can be "at91sam9260", "at91sam9g45" or "at91sam9x5"
    - reg: Should contain ADC registers location and length
    - interrupts: Should contain the IRQ line for the ADC
+   - clock-names: tuple listing input clock names.
+ 	Required elements: "adc_clk", "adc_op_clk".
+   - clocks: phandles to input clocks.
 -  - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this
 +  - atmel,adc-channels-used: Bitmask of the channels muxed and enabled for this
      device
    - atmel,adc-startup-time: Startup Time of the ADC in microseconds as
      defined in the datasheet
@@@ -41,14 -44,19 +44,16 @@@ Optional trigger Nodes
  
  Examples:
  adc0: adc at fffb0000 {
 +	#address-cells = <1>;
 +	#size-cells = <0>;
  	compatible = "atmel,at91sam9260-adc";
  	reg = <0xfffb0000 0x100>;
 -	interrupts = <20 4>;
 +	interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
+ 	clocks = <&adc_clk>, <&adc_op_clk>;
+ 	clock-names = "adc_clk", "adc_op_clk";
 -	atmel,adc-channel-base = <0x30>;
  	atmel,adc-channels-used = <0xff>;
 -	atmel,adc-drdy-mask = <0x10000>;
 -	atmel,adc-num-channels = <8>;
  	atmel,adc-startup-time = <40>;
 -	atmel,adc-status-register = <0x1c>;
 -	atmel,adc-trigger-register = <0x08>;
 -	atmel,adc-use-external;
 +	atmel,adc-use-external-triggers;
  	atmel,adc-vref = <3300>;
  	atmel,adc-res = <8 10>;
  	atmel,adc-res-names = "lowres", "highres";
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140318/be9e9b24/attachment-0001.sig>

linux-next: manual merge of the staging tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2303 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
Documentation/devicetree/bindings/iio/adc/at91_adc.txt between commit
b5303ffbcf11 ("Documentation: dt: iio: improve atmel-adc documentation")
from the arm-soc tree and commit 1a5b7d41f8f6 ("iio: at91: document ADC
clock properties") from the staging tree.

[This file is renamed from
Documentation/devicetree/bindings/arm/atmel-adc.txt in the arm-soc tree.]

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc Documentation/devicetree/bindings/iio/adc/at91_adc.txt
index 82061c7e4fea,9a1175b46f49..000000000000
--- a/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
@@@ -5,7 -5,10 +5,10 @@@ Required properties
      <chip> can be "at91sam9260", "at91sam9g45" or "at91sam9x5"
    - reg: Should contain ADC registers location and length
    - interrupts: Should contain the IRQ line for the ADC
+   - clock-names: tuple listing input clock names.
+ 	Required elements: "adc_clk", "adc_op_clk".
+   - clocks: phandles to input clocks.
 -  - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this
 +  - atmel,adc-channels-used: Bitmask of the channels muxed and enabled for this
      device
    - atmel,adc-startup-time: Startup Time of the ADC in microseconds as
      defined in the datasheet
@@@ -41,14 -44,19 +44,16 @@@ Optional trigger Nodes
  
  Examples:
  adc0: adc@fffb0000 {
 +	#address-cells = <1>;
 +	#size-cells = <0>;
  	compatible = "atmel,at91sam9260-adc";
  	reg = <0xfffb0000 0x100>;
 -	interrupts = <20 4>;
 +	interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
+ 	clocks = <&adc_clk>, <&adc_op_clk>;
+ 	clock-names = "adc_clk", "adc_op_clk";
 -	atmel,adc-channel-base = <0x30>;
  	atmel,adc-channels-used = <0xff>;
 -	atmel,adc-drdy-mask = <0x10000>;
 -	atmel,adc-num-channels = <8>;
  	atmel,adc-startup-time = <40>;
 -	atmel,adc-status-register = <0x1c>;
 -	atmel,adc-trigger-register = <0x08>;
 -	atmel,adc-use-external;
 +	atmel,adc-use-external-triggers;
  	atmel,adc-vref = <3300>;
  	atmel,adc-res = <8 10>;
  	atmel,adc-res-names = "lowres", "highres";

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]