ARM: dts: keystone: Move keystone_irq to under device-state-control

The keystone_irq node describes a device that is a member of the device
state control module address space. As such, it should not be a member
of soc0 bus but instead a sub-node of device-state-control.

This move also fixes a warning about not having a reg property. Now
that this is a sub-node of device-state-control, a syscon type node,
we add this reg property but relative to the syscon base, this way
when the dt-binding/driver are updated we can drop the non-standard
ti,syscon-dev property completely and simply use get_resource() in
the driver.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>

diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 93ea5c69ea77a2e8a1d4500e491c3bf815b0c2aa..d726896ffb38f021c1342073c07e9fb4f7c3aaa3 100644 (file)
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -87,8 +87,20 @@
                };
 
                devctrl: device-state-control@2620000 {
-                       compatible = "ti,keystone-devctrl", "syscon";
+                       compatible = "ti,keystone-devctrl", "syscon", "simple-mfd";
                        reg = <0x02620000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x02620000 0x1000>;
+
+                       kirq0: keystone_irq@2a0 {
+                               compatible = "ti,keystone-irq";
+                               reg = <0x2a0 0x4>;
+                               interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
+                               interrupt-controller;
+                               #interrupt-cells = <1>;
+                               ti,syscon-dev = <&devctrl 0x2a0>;
+                       };
                };
 
                rstctrl: reset-controller {
@@ -282,14 +294,6 @@
                                  1 0 0x21000A00 0x00000100>;
                };
 
-               kirq0: keystone_irq@26202a0 {
-                       compatible = "ti,keystone-irq";
-                       interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-controller;
-                       #interrupt-cells = <1>;
-                       ti,syscon-dev = <&devctrl 0x2a0>;
-               };
-
                pcie0: pcie@21800000 {
                        compatible = "ti,keystone-pcie", "snps,dw-pcie";
                        clocks = <&clkpcie>;