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

[Mark Brown]

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in:

  arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts
  arch/arm/boot/dts/imx53-tx53-x13x.dts
  arch/arm/boot/dts/imx6dl-tx6u-811x.dts
  arch/arm/boot/dts/imx6q-icore-rqs.dts
  arch/arm/boot/dts/imx6q-tx6q-1110.dts
  arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts
  arch/arm/boot/dts/imx6sx.dtsi
  arch/arm/boot/dts/imx6ul.dtsi

between commit:

  8dccafaa281aa1 ("arm: dts: fix unit-address leading 0s")

from the arm-soc tree and various commits from the imx-mxs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/arm/boot/dts/imx53-tx53-x13x.dts
index be31c5d1db05,a87a10b942cf..000000000000
--- a/arch/arm/boot/dts/imx53-tx53-x13x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x13x.dts
@@@ -106,11 -121,14 +121,14 @@@
  };
  
  &i2c3 {
- 	pinctrl-names = "default";
+ 	pinctrl-names = "default", "gpio";
  	pinctrl-0 = <&pinctrl_i2c3>;
+ 	pinctrl-1 = <&pinctrl_i2c3_gpio>;
+ 	scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
+ 	sda-gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;
  	status = "okay";
  
 -	sgtl5000: codec@0a {
 +	sgtl5000: codec@a {
  		compatible = "fsl,sgtl5000";
  		reg = <0x0a>;
  		VDDA-supply = <&reg_2v5>;
diff --cc arch/arm/boot/dts/imx6dl-tx6u-811x.dts
index 94bf1c485740,5342f2f5a8a8..000000000000
--- a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
diff --cc arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts
index 839ab8619bbd,c4588fb0bf6f..000000000000
--- a/arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts
diff --cc arch/arm/boot/dts/imx6q-icore-rqs.dts
index 745bc2886a47,b81f48c6a8c6..000000000000
--- a/arch/arm/boot/dts/imx6q-icore-rqs.dts
+++ b/arch/arm/boot/dts/imx6q-icore-rqs.dts
diff --cc arch/arm/boot/dts/imx6q-tx6q-1110.dts
index f4793dec5d9b,f7b0acb65352..000000000000
--- a/arch/arm/boot/dts/imx6q-tx6q-1110.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1110.dts
diff --cc arch/arm/boot/dts/imx6sx.dtsi
index 32d71245b2a6,375efa3f547e..000000000000
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@@ -993,13 -994,23 +994,23 @@@
  				status = "disabled";
  			};
  
 -			ocotp: ocotp@021bc000 {
 +			ocotp: ocotp@21bc000 {
+ 				#address-cells = <1>;
+ 				#size-cells = <1>;
  				compatible = "fsl,imx6sx-ocotp", "syscon";
  				reg = <0x021bc000 0x4000>;
  				clocks = <&clks IMX6SX_CLK_OCOTP>;
+ 
+ 				tempmon_calib: calib@38 {
+ 					reg = <0x38 4>;
+ 				};
+ 
+ 				tempmon_temp_grade: temp-grade@20 {
+ 					reg = <0x20 4>;
+ 				};
  			};
  
 -			sai1: sai@021d4000 {
 +			sai1: sai@21d4000 {
  				compatible = "fsl,imx6sx-sai";
  				reg = <0x021d4000 0x4000>;
  				interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
diff --cc arch/arm/boot/dts/imx6ul.dtsi
index 2057ee695a66,d5181f85ca9c..000000000000
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi

Attachment: signature.asc
Description: PGP signature