ARM: dts: keystone-k2hk: Move keystone_dsp_gpio 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 warnings 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
gpio,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-k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi
index ed59474..ca0f198 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2hk.dtsi
+++ b/arch/arm/boot/dts/keystone-k2hk.dtsi
@@ -87,60 +87,70 @@
                        };
                };
 
-               dspgpio0: keystone_dsp_gpio@2620240 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x240>;
-               };
+               devctrl: device-state-control@2620000 {
+                       dspgpio0: keystone_dsp_gpio@240 {
+                               compatible = "ti,keystone-dsp-gpio";
+                               reg = <0x240 0x4>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio,syscon-dev = <&devctrl 0x240>;
+                       };
 
-               dspgpio1: keystone_dsp_gpio@2620244 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x244>;
-               };
+                       dspgpio1: keystone_dsp_gpio@244 {
+                               compatible = "ti,keystone-dsp-gpio";
+                               reg = <0x244 0x4>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio,syscon-dev = <&devctrl 0x244>;
+                       };
 
-               dspgpio2: keystone_dsp_gpio@2620248 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x248>;
-               };
+                       dspgpio2: keystone_dsp_gpio@248 {
+                               compatible = "ti,keystone-dsp-gpio";
+                               reg = <0x248 0x4>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio,syscon-dev = <&devctrl 0x248>;
+                       };
 
-               dspgpio3: keystone_dsp_gpio@262024c {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x24c>;
-               };
+                       dspgpio3: keystone_dsp_gpio@24c {
+                               compatible = "ti,keystone-dsp-gpio";
+                               reg = <0x24c 0x4>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio,syscon-dev = <&devctrl 0x24c>;
+                       };
 
-               dspgpio4: keystone_dsp_gpio@2620250 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x250>;
-               };
+                       dspgpio4: keystone_dsp_gpio@250 {
+                               compatible = "ti,keystone-dsp-gpio";
+                               reg = <0x250 0x4>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio,syscon-dev = <&devctrl 0x250>;
+                       };
 
-               dspgpio5: keystone_dsp_gpio@2620254 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x254>;
-               };
+                       dspgpio5: keystone_dsp_gpio@254 {
+                               compatible = "ti,keystone-dsp-gpio";
+                               reg = <0x254 0x4>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio,syscon-dev = <&devctrl 0x254>;
+                       };
 
-               dspgpio6: keystone_dsp_gpio@2620258 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x258>;
-               };
+                       dspgpio6: keystone_dsp_gpio@258 {
+                               compatible = "ti,keystone-dsp-gpio";
+                               reg = <0x258 0x4>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio,syscon-dev = <&devctrl 0x258>;
+                       };
 
-               dspgpio7: keystone_dsp_gpio@262025c {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x25c>;
+                       dspgpio7: keystone_dsp_gpio@25c {
+                               compatible = "ti,keystone-dsp-gpio";
+                               reg = <0x25c 0x4>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio,syscon-dev = <&devctrl 0x25c>;
+                       };
                };
 
                dsp0: dsp@10800000 {