Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c30bb58 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Santosh Shilimkar
Browse files

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: default avatarAndrew F. Davis <afd@ti.com>
Acked-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
parent 91ab883e

arch/arm/boot/dts/keystone.dtsi

+13 −9
Original line number Diff line number Diff line
@@ -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>;