Merge tag 'omap-for-v5.6/dt-late-signed' of git://git.kernel.org/pub/scm/linux/kernel...

Late omap dts changes for v5.6 merge window

This series of changes mostly configures the cameras for dra7 and
am437x that have been pending for few months now because of waiting
for clock dependencies to clear. So these changes are based on earlier
dts changes with with Tero Kristo's for-5.6-ti-clk branch merged in.

Then there's a series of changes to configure powervr sgx target module
for am335x, am437x and dra7 that have been waiting to have the rstctrl
reset driver dependencies to clear.

Also included are few minor patches to configure 1-wire and coulomb
counter calibration interrupt for droid4.

* tag 'omap-for-v5.6/dt-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (25 commits)
  ARM: dts: omap4-droid4: Enable hdq for droid4 ds250x 1-wire battery nvmem
  ARM: dts: motorola-cpcap-mapphone: Configure calibration interrupt
  ARM: dts: Configure interconnect target module for am437x sgx
  ARM: dts: Configure sgx for dra7
  ARM: dts: Configure rstctrl reset for am335x SGX
  ARM: dts: dra7: Add ti-sysc node for VPE
  ARM: dts: dra7: add vpe clkctrl node
  ARM: dts: am43x-epos-evm: Add VPFE and OV2659 entries
  ARM: dts: am437x-sk-evm: Add VPFE and OV2659 entries
  ARM: dts: am43xx: add support for clkout1 clock
  arm: dts: dra76-evm: Add CAL and OV5640 nodes
  arm: dtsi: dra76x: Add CAL dtsi node
  arm: dts: dra72-evm-common: Add entries for the CSI2 cameras
  ARM: dts: DRA72: Add CAL dtsi node
  ARM: dts: dra7-l4: Add ti-sysc node for CAM
  ARM: OMAP: DRA7xx: Make CAM clock domain SWSUP only
  ARM: dts: dra7: add cam clkctrl node
  ARM: dts: Add omap3-echo
  ARM: dts: Add dtsi files for AM3703, AM3715 and DM3725
  ARM: dts: am335x-icev2: Add support for OSD9616P0899-10 at i2c0
  ...

Link: https://lore.kernel.org/r/pull-1579896427-50330@atomide.com-3
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/boot/dts/am33xx.dtsi
index e403fb765e707f4a049d9fa762dd7a9decf823b0,c427ce8c253924edacba59659c91f19b832707fe..41dcfb37155a7ad4ee7c5e8895e16840f7d0122e
--- 1/arch/arm/boot/dts/am33xx.dtsi
--- 2/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -439,63 -439,49 +439,88 @@@
                        status = "disabled";
                };
  
 -              sham: sham@53100000 {
 -                      compatible = "ti,omap4-sham";
 -                      ti,hwmods = "sham";
 -                      reg = <0x53100000 0x200>;
 -                      interrupts = <109>;
 -                      dmas = <&edma 36 0>;
 -                      dma-names = "rx";
 +              sham_target: target-module@53100000 {
 +                      compatible = "ti,sysc-omap3-sham", "ti,sysc";
 +                      reg = <0x53100100 0x4>,
 +                            <0x53100110 0x4>,
 +                            <0x53100114 0x4>;
 +                      reg-names = "rev", "sysc", "syss";
 +                      ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
 +                                       SYSC_OMAP2_AUTOIDLE)>;
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>;
 +                      ti,syss-mask = <1>;
 +                      /* Domains (P, C): per_pwrdm, l3_clkdm */
 +                      clocks = <&l3_clkctrl AM3_L3_SHAM_CLKCTRL 0>;
 +                      clock-names = "fck";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges = <0x0 0x53100000 0x1000>;
 +
 +                      sham: sham@0 {
 +                              compatible = "ti,omap4-sham";
 +                              reg = <0 0x200>;
 +                              interrupts = <109>;
 +                              dmas = <&edma 36 0>;
 +                              dma-names = "rx";
 +                      };
                };
  
 -              aes: aes@53500000 {
 -                      compatible = "ti,omap4-aes";
 -                      ti,hwmods = "aes";
 -                      reg = <0x53500000 0xa0>;
 -                      interrupts = <103>;
 -                      dmas = <&edma 6 0>,
 -                             <&edma 5 0>;
 -                      dma-names = "tx", "rx";
 +              aes_target: target-module@53500000 {
 +                      compatible = "ti,sysc-omap2", "ti,sysc";
 +                      reg = <0x53500080 0x4>,
 +                            <0x53500084 0x4>,
 +                            <0x53500088 0x4>;
 +                      reg-names = "rev", "sysc", "syss";
 +                      ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
 +                                       SYSC_OMAP2_AUTOIDLE)>;
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>,
 +                                      <SYSC_IDLE_SMART_WKUP>;
 +                      ti,syss-mask = <1>;
 +                      /* Domains (P, C): per_pwrdm, l3_clkdm */
 +                      clocks = <&l3_clkctrl AM3_L3_AES_CLKCTRL 0>;
 +                      clock-names = "fck";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges = <0x0 0x53500000 0x1000>;
 +
 +                      aes: aes@0 {
 +                              compatible = "ti,omap4-aes";
 +                              reg = <0 0xa0>;
 +                              interrupts = <103>;
 +                              dmas = <&edma 6 0>,
 +                                     <&edma 5 0>;
 +                              dma-names = "tx", "rx";
 +                      };
                };
+ 
+               target-module@56000000 {
+                       compatible = "ti,sysc-omap4", "ti,sysc";
+                       reg = <0x5600fe00 0x4>,
+                             <0x5600fe10 0x4>;
+                       reg-names = "rev", "sysc";
+                       ti,sysc-midle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_NO>,
+                                       <SYSC_IDLE_SMART>;
+                       ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_NO>,
+                                       <SYSC_IDLE_SMART>;
+                       clocks = <&gfx_l3_clkctrl AM3_GFX_L3_GFX_CLKCTRL 0>;
+                       clock-names = "fck";
+                       resets = <&prm_gfx 0>;
+                       reset-names = "rstctrl";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0x56000000 0x1000000>;
+ 
+                       /*
+                        * Closed source PowerVR driver, no child device
+                        * binding or driver in mainline
+                        */
+               };
        };
  };
  

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am43x-epos-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/dra7-l4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc arch/arm/boot/dts/motorola-mapphone-common.dtsi
Simple merge