summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/keystone.dtsi
diff options
context:
space:
mode:
authorAndrew F. Davis <afd@ti.com>2018-03-06 03:18:47 +0300
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>2018-03-06 03:18:47 +0300
commit4c30bb58f542254837bb4c2bcafca7b0b874e2b5 (patch)
tree80d29d1dfe1d3c26c6ace191fb4c14e90b3d8a2a /arch/arm/boot/dts/keystone.dtsi
parent91ab883eb21325ad80f3473633f794c78ac87f51 (diff)
downloadlinux-4c30bb58f542254837bb4c2bcafca7b0b874e2b5.tar.xz
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>
Diffstat (limited to 'arch/arm/boot/dts/keystone.dtsi')
-rw-r--r--arch/arm/boot/dts/keystone.dtsi22
1 files changed, 13 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 93ea5c69ea77..d726896ffb38 100644
--- 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>;