Merge tag 'pstore-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / keystone-k2e.dtsi

diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi
index 0bcd3f8..085e732 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2e.dtsi
+++ b/arch/arm/boot/dts/keystone-k2e.dtsi
@@ -109,11 +109,14 @@
                        };
                };
 
-               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>;
+                       };
                };
 
                dsp0: dsp@10800000 {