From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 15 Apr 2015 19:35:22 +0000 (+0200)
Subject: Merge branch 'omap/dt' into next/late
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30ecc84eea691cfb0b731d71839bdcba88df5f75;p=linux-beck.git

Merge branch 'omap/dt' into next/late

As pointed out by Stephen Rothwell, commit e52117638b79 ("ARM: dts:
omap3: Add DT entries for OMAP 3 ISP") conflicts with b8845074cfbb
("ARM: dts: omap3: add minimal l4 bus layout with control module support")
in non-obvious ways, causing a build failure when both patches
are present.

This merges the two branches that introduce the respective changes
into the next/late branch to resolve the way that Stephen suggested,
as confirmed by Tony.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.org/lkml/2015/4/6/436
Acked-by: Tony Lindgren <tony@atomide.com>
---

30ecc84eea691cfb0b731d71839bdcba88df5f75
diff --cc arch/arm/boot/dts/omap34xx.dtsi
index 3819c1e91591,7bc8c0f72ddb..4f6b2d5b1902
--- a/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@@ -37,6 -39,21 +39,21 @@@
  			pinctrl-single,register-width = <16>;
  			pinctrl-single,function-mask = <0xff1f>;
  		};
+ 
+ 		isp: isp@480bc000 {
+ 			compatible = "ti,omap3-isp";
+ 			reg = <0x480bc000 0x12fc
+ 			       0x480bd800 0x017c>;
+ 			interrupts = <24>;
+ 			iommus = <&mmu_isp>;
 -			syscon = <&omap3_scm_general 0xdc>;
++			syscon = <&scm_conf 0xdc>;
+ 			ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;
+ 			#clock-cells = <1>;
+ 			ports {
+ 				#address-cells = <1>;
+ 				#size-cells = <0>;
+ 			};
+ 		};
  	};
  };
  
diff --cc arch/arm/boot/dts/omap36xx.dtsi
index 541704a59a5a,3502fe00ec7d..86253de5a97a
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@@ -69,6 -71,21 +71,21 @@@
  			pinctrl-single,register-width = <16>;
  			pinctrl-single,function-mask = <0xff1f>;
  		};
+ 
+ 		isp: isp@480bc000 {
+ 			compatible = "ti,omap3-isp";
+ 			reg = <0x480bc000 0x12fc
+ 			       0x480bd800 0x0600>;
+ 			interrupts = <24>;
+ 			iommus = <&mmu_isp>;
 -			syscon = <&omap3_scm_general 0x2f0>;
++			syscon = <&scm_conf 0x2f0>;
+ 			ti,phy-type = <OMAP3ISP_PHY_TYPE_CSIPHY>;
+ 			#clock-cells = <1>;
+ 			ports {
+ 				#address-cells = <1>;
+ 				#size-cells = <0>;
+ 			};
+ 		};
  	};
  };