ARM: dts: Move am437x dss to the interconnect target module in l4

On am437x, the display subsystem (DSS) is on l4. We already have
the interconnect target module for it, so let's just move dss
there.

To do that, we need to adjust the module addresses for the ranges,
and use the ranges already added earlier based on reading the l4
interconnect instance AP registers.

Cc: Jyri Sarha <jsarha@ti.com>
Cc: Keerthy <j-keerthy@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/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index faa14dc0faff701b6a8240e02751b7b963a3e66c..830cce2bda2b8b0eee9c5fbfde9feec821fd59a2 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -394,38 +394,6 @@
                        };
                };
 
-               dss: dss@4832a000 {
-                       compatible = "ti,omap3-dss";
-                       reg = <0x4832a000 0x200>;
-                       status = "disabled";
-                       ti,hwmods = "dss_core";
-                       clocks = <&disp_clk>;
-                       clock-names = "fck";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-
-                       dispc: dispc@4832a400 {
-                               compatible = "ti,omap3-dispc";
-                               reg = <0x4832a400 0x400>;
-                               interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-                               ti,hwmods = "dss_dispc";
-                               clocks = <&disp_clk>;
-                               clock-names = "fck";
-
-                               max-memory-bandwidth = <230000000>;
-                       };
-
-                       rfbi: rfbi@4832a800 {
-                               compatible = "ti,omap3-rfbi";
-                               reg = <0x4832a800 0x100>;
-                               ti,hwmods = "dss_rfbi";
-                               clocks = <&disp_clk>;
-                               clock-names = "fck";
-                               status = "disabled";
-                       };
-               };
-
                ocmcram: sram@40300000 {
                        compatible = "mmio-sram";
                        reg = <0x40300000 0x40000>; /* 256k */

diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
index e18e17d312726623ac903472f2c09902500a238e..fdcd792d023ca52e39d60858fee40e5c9e603d58 100644 (file)
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -2135,6 +2135,41 @@
                                 <0x00000800 0x0002a800 0x00000400>,
                                 <0x00000c00 0x0002ac00 0x00000400>,
                                 <0x00001000 0x0002b000 0x00001000>;
+
+                       dss: dss@0 {
+                               compatible = "ti,omap3-dss";
+                               reg = <0 0x200>;
+                               status = "disabled";
+                               clocks = <&disp_clk>;
+                               clock-names = "fck";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges = <0x00000000 0x00000000 0x00000400>,
+                                        <0x00000400 0x00000400 0x00000400>,
+                                        <0x00000800 0x00000800 0x00000400>,
+                                        <0x00000c00 0x00000c00 0x00000400>,
+                                        <0x00001000 0x00001000 0x00001000>;
+
+                               dispc: dispc@4000 {
+                                       compatible = "ti,omap3-dispc";
+                                       reg = <0x400 0x400>;
+                                       interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                                       ti,hwmods = "dss_dispc";
+                                       clocks = <&disp_clk>;
+                                       clock-names = "fck";
+
+                                       max-memory-bandwidth = <230000000>;
+                               };
+
+                               rfbi: rfbi@800 {
+                                       compatible = "ti,omap3-rfbi";
+                                       reg = <0x800 0x100>;
+                                       ti,hwmods = "dss_rfbi";
+                                       clocks = <&disp_clk>;
+                                       clock-names = "fck";
+                                       status = "disabled";
+                               };
+                       };
                };
 
                target-module@3d000 {                   /* 0x4833d000, ap 102 6e.0 */