Skip to content

Commit

Permalink
ARM: dts: sun8i: r40: Move AHCI device node based on address order
Browse files Browse the repository at this point in the history
When the AHCI device node was added, it was added in the wrong location
in the device tree file. The device nodes should be sorted by register
address.

Move the device node to before EHCI1, where it belongs.

Fixes: 41c64d3 ("ARM: dts: sun8i: r40: add sata node")
Acked-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  • Loading branch information
Chen-Yu Tsai committed Mar 11, 2020
1 parent a43ab30 commit fe3a048
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions arch/arm/boot/dts/sun8i-r40.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,16 @@
resets = <&ccu RST_BUS_CE>;
};

ahci: sata@1c18000 {
compatible = "allwinner,sun8i-r40-ahci";
reg = <0x01c18000 0x1000>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>;
resets = <&ccu RST_BUS_SATA>;
reset-names = "ahci";
status = "disabled";
};

ehci1: usb@1c19000 {
compatible = "allwinner,sun8i-r40-ehci", "generic-ehci";
reg = <0x01c19000 0x100>;
Expand Down Expand Up @@ -705,17 +715,6 @@
#size-cells = <0>;
};

ahci: sata@1c18000 {
compatible = "allwinner,sun8i-r40-ahci";
reg = <0x01c18000 0x1000>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>;
resets = <&ccu RST_BUS_SATA>;
reset-names = "ahci";
status = "disabled";

};

gmac: ethernet@1c50000 {
compatible = "allwinner,sun8i-r40-gmac";
syscon = <&ccu>;
Expand Down

0 comments on commit fe3a048

Please sign in to comment.