From: Tony Lindgren <tony@atomide.com>
Date: Tue, 17 Dec 2019 17:34:14 +0000 (-0800)
Subject: Merge branch 'omap-for-v5.6/ti-sysc-dt' into omap-for-v5.6/ti-sysc-drop-pdata
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=54a751f623f54af53cfbb154b9c3a8bdcc43c9e2;p=linux.git

Merge branch 'omap-for-v5.6/ti-sysc-dt' into omap-for-v5.6/ti-sysc-drop-pdata
---

54a751f623f54af53cfbb154b9c3a8bdcc43c9e2
diff --cc arch/arm/boot/dts/omap4.dtsi
index 394ef4ad3e958,af901fc6e9096..38b4146d4d337
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@@ -206,16 -198,38 +198,37 @@@
  			/* No child device binding, driver in staging */
  		};
  
- 		mmu_ipu: mmu@55082000 {
- 			compatible = "ti,omap4-iommu";
- 			reg = <0x55082000 0x100>;
- 			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
- 			ti,hwmods = "mmu_ipu";
- 			#iommu-cells = <0>;
- 			ti,iommu-bus-err-back;
+ 		target-module@55082000 {
+ 			compatible = "ti,sysc-omap2", "ti,sysc";
+ 			reg = <0x55082000 0x4>,
+ 			      <0x55082010 0x4>,
+ 			      <0x55082014 0x4>;
+ 			reg-names = "rev", "sysc", "syss";
+ 			ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+ 					<SYSC_IDLE_NO>,
+ 					<SYSC_IDLE_SMART>;
+ 			ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
+ 					 SYSC_OMAP2_SOFTRESET |
+ 					 SYSC_OMAP2_AUTOIDLE)>;
+ 			clocks = <&ducati_clkctrl OMAP4_IPU_CLKCTRL 0>;
+ 			clock-names = "fck";
+ 			resets = <&prm_core 2>;
+ 			reset-names = "rstctrl";
+ 			ranges = <0x0 0x55082000 0x100>;
+ 			#size-cells = <1>;
+ 			#address-cells = <1>;
+ 
+ 			mmu_ipu: mmu@0 {
+ 				compatible = "ti,omap4-iommu";
+ 				reg = <0x0 0x100>;
+ 				interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+ 				#iommu-cells = <0>;
+ 				ti,iommu-bus-err-back;
+ 			};
  		};
+ 
  		target-module@4012c000 {
  			compatible = "ti,sysc-omap4", "ti,sysc";
 -			ti,hwmods = "slimbus1";
  			reg = <0x4012c000 0x4>,
  			      <0x4012c010 0x4>;
  			reg-names = "rev", "sysc";