ARM: dts: keystone: Move reset-controller 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 d726896ffb38f021c1342073c07e9fb4f7c3aaa3..5246042f522bcab0dec95fb4bcd77d4d1213d927 100644 (file)
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -101,13 +101,14 @@
                                #interrupt-cells = <1>;
                                ti,syscon-dev = <&devctrl 0x2a0>;
                        };
-               };
 
-               rstctrl: reset-controller {
-                       compatible = "ti,keystone-reset";
-                       ti,syscon-pll = <&pllctrl 0xe4>;
-                       ti,syscon-dev = <&devctrl 0x328>;
-                       ti,wdt-list = <0>;
+                       rstctrl: reset-controller@328 {
+                               compatible = "ti,keystone-reset";
+                               reg = <0x328 0x10>;
+                               ti,syscon-pll = <&pllctrl 0xe4>;
+                               ti,syscon-dev = <&devctrl 0x328>;
+                               ti,wdt-list = <0>;
+                       };
                };
 
                /include/ "keystone-clocks.dtsi"