diff options
| author | Daniel Mack <daniel@zonque.org> | 2018-11-30 18:55:41 +0100 |
|---|---|---|
| committer | Robert Jarzmik <robert.jarzmik@free.fr> | 2018-12-02 11:19:13 +0100 |
| commit | 64396bd286d36a3926f099db297f4d25b3156896 (patch) | |
| tree | 5c7647bf2c78a6262a7b6cb64eab568682477fdb /arch/arm/boot/dts/pxa3xx.dtsi | |
| parent | ARM: dts: pxa2xx: fix hwuart memory range (diff) | |
| download | linux-64396bd286d36a3926f099db297f4d25b3156896.tar.xz linux-64396bd286d36a3926f099db297f4d25b3156896.zip | |
ARM: dts: pxa3xx: order timer and gcu nodes under /pxabus
These are devices on the PXA bus, so make the device tree structure
reflect that.
Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Diffstat (limited to 'arch/arm/boot/dts/pxa3xx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/pxa3xx.dtsi | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index eb3223e85f9a..71c470a5d03f 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -273,6 +273,22 @@ clocks = <&clks CLK_SSP4>; status = "disabled"; }; + + timer@40a00000 { + compatible = "marvell,pxa-timer"; + reg = <0x40a00000 0x20>; + interrupts = <26>; + clocks = <&clks CLK_OSTIMER>; + status = "okay"; + }; + + gcu: display-controller@54000000 { + compatible = "marvell,pxa300-gcu"; + reg = <0x54000000 0x1000>; + interrupts = <39>; + clocks = <&clks CLK_PXA300_GCU>; + status = "disabled"; + }; }; clocks { @@ -290,20 +306,4 @@ status = "okay"; }; }; - - timer@40a00000 { - compatible = "marvell,pxa-timer"; - reg = <0x40a00000 0x20>; - interrupts = <26>; - clocks = <&clks CLK_OSTIMER>; - status = "okay"; - }; - - gcu: display-controller@54000000 { - compatible = "marvell,pxa300-gcu"; - reg = <0x54000000 0x1000>; - interrupts = <39>; - clocks = <&clks CLK_PXA300_GCU>; - status = "disabled"; - }; }; |