ARM: dts: Configure interconnect target module for dra7 dss

We can now probe devices with device tree only configuration using
ti-sysc interconnect target module driver. Let's configure the
module, but keep the legacy "ti,hwmods" peroperty until the child
devices are probing with ti-sysc interconnect driver.

Initially let's just update the top level dss node to probe with ti-sysc
interconnect target module driver. The child nodes are still children
of dispc, only the node indentation changes for them now along with
using the reg range provided by top level dss.

Cc: Jyri Sarha <jsarha@ti.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index d78b684e7fca0330d760502d9f45168bb1996b5e..cf90a0e7528cead1a6bb1a27d6bb3a9c1d1f620d 100644 (file)
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -705,44 +705,60 @@
                        ti,irqs-safe-map = <0>;
                };
 
-               dss: dss@58000000 {
-                       compatible = "ti,dra7-dss";
-                       /* 'reg' defined in dra72x.dtsi and dra74x.dtsi */
-                       /* 'clocks' defined in dra72x.dtsi and dra74x.dtsi */
-                       status = "disabled";
+               target-module@58000000 {
+                       compatible = "ti,sysc-omap2", "ti,sysc";
                        ti,hwmods = "dss_core";
-                       /* CTRL_CORE_DSS_PLL_CONTROL */
-                       syscon-pll-ctrl = <&scm_conf 0x538>;
+                       reg = <0x58000000 4>,
+                             <0x58000014 4>;
+                       reg-names = "rev", "syss";
+                       ti,syss-mask = <1>;
+                       clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 0>,
+                                <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 9>,
+                                <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 10>,
+                                <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 11>;
+                       clock-names = "fck", "hdmi_clk", "sys_clk", "tv_clk";
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       ranges;
-
-                       dispc@58001000 {
-                               compatible = "ti,dra7-dispc";
-                               reg = <0x58001000 0x1000>;
-                               interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-                               ti,hwmods = "dss_dispc";
-                               clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 8>;
-                               clock-names = "fck";
-                               /* CTRL_CORE_SMA_SW_1 */
-                               syscon-pol = <&scm_conf 0x534>;
-                       };
+                       ranges = <0 0x58000000 0x800000>;
 
-                       hdmi: encoder@58060000 {
-                               compatible = "ti,dra7-hdmi";
-                               reg = <0x58040000 0x200>,
-                                     <0x58040200 0x80>,
-                                     <0x58040300 0x80>,
-                                     <0x58060000 0x19000>;
-                               reg-names = "wp", "pll", "phy", "core";
-                               interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+                       dss: dss@0 {
+                               compatible = "ti,dra7-dss";
+                               /* 'reg' defined in dra72x.dtsi and dra74x.dtsi */
+                               /* 'clocks' defined in dra72x.dtsi and dra74x.dtsi */
                                status = "disabled";
-                               ti,hwmods = "dss_hdmi";
-                               clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 9>,
-                                        <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 10>;
-                               clock-names = "fck", "sys_clk";
-                               dmas = <&sdma_xbar 76>;
-                               dma-names = "audio_tx";
+                               /* CTRL_CORE_DSS_PLL_CONTROL */
+                               syscon-pll-ctrl = <&scm_conf 0x538>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges = <0 0 0x800000>;
+
+                               dispc@1000 {
+                                       compatible = "ti,dra7-dispc";
+                                       reg = <0x1000 0x1000>;
+                                       interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                                       ti,hwmods = "dss_dispc";
+                                       clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 8>;
+                                       clock-names = "fck";
+                                       /* CTRL_CORE_SMA_SW_1 */
+                                       syscon-pol = <&scm_conf 0x534>;
+                               };
+
+                               hdmi: encoder@40000 {
+                                       compatible = "ti,dra7-hdmi";
+                                       reg = <0x40000 0x200>,
+                                             <0x40200 0x80>,
+                                             <0x40300 0x80>,
+                                             <0x60000 0x19000>;
+                                       reg-names = "wp", "pll", "phy", "core";
+                                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+                                       status = "disabled";
+                                       ti,hwmods = "dss_hdmi";
+                                       clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 9>,
+                                                <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 10>;
+                                       clock-names = "fck", "sys_clk";
+                                       dmas = <&sdma_xbar 76>;
+                                       dma-names = "audio_tx";
+                               };
                        };
                };
 

diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
index 82b57a35abc04d32bb5ac708c40555c7a437b056..da334489b18fc9105b83f8e60cc94acc2c52d6bb 100644 (file)
--- a/arch/arm/boot/dts/dra72x.dtsi
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@ -60,9 +60,9 @@
 };
 
 &dss {
-       reg = <0x58000000 0x80>,
-             <0x58004054 0x4>,
-             <0x58004300 0x20>;
+       reg = <0 0x80>,
+             <0x4054 0x4>,
+             <0x4300 0x20>;
        reg-names = "dss", "pll1_clkctrl", "pll1";
 
        clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 8>,

diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi
index c5abc436ca1f5c171e2bbc17a3b97e2e9a296bf3..7b1c6129825312a5919e0561d689fac9912da83d 100644 (file)
--- a/arch/arm/boot/dts/dra74x.dtsi
+++ b/arch/arm/boot/dts/dra74x.dtsi
@@ -132,11 +132,11 @@
 };
 
 &dss {
-       reg = <0x58000000 0x80>,
-             <0x58004054 0x4>,
-             <0x58004300 0x20>,
-             <0x58009054 0x4>,
-             <0x58009300 0x20>;
+       reg = <0 0x80>,
+             <0x4054 0x4>,
+             <0x4300 0x20>,
+             <0x9054 0x4>,
+             <0x9300 0x20>;
        reg-names = "dss", "pll1_clkctrl", "pll1",
                    "pll2_clkctrl", "pll2";