summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/keystone-k2e.dtsi
diff options
context:
space:
mode:
authorAndrew F. Davis <afd@ti.com>2018-03-06 01:18:48 +0100
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>2018-03-06 01:18:48 +0100
commit056a3ccb8492ebf2d121660d182b4f86076bb739 (patch)
tree89ec50152d6e8bf9d5ea5705583fed594d12bd65 /arch/arm/boot/dts/keystone-k2e.dtsi
parentARM: dts: keystone: Move reset-controller to under device-state-control (diff)
downloadlinux-056a3ccb8492ebf2d121660d182b4f86076bb739.tar.xz
linux-056a3ccb8492ebf2d121660d182b4f86076bb739.zip
ARM: dts: keystone-k2e: 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 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 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>
Diffstat (limited to 'arch/arm/boot/dts/keystone-k2e.dtsi')
-rw-r--r--arch/arm/boot/dts/keystone-k2e.dtsi13
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi
index 0bcd3f8a9c45..085e7326ea8e 100644
--- 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 {