| From ac417decfddaf20923f16bd2567714439fce82e5 Mon Sep 17 00:00:00 2001 |
| From: Chen-Yu Tsai <wens@csie.org> |
| Date: Wed, 11 Mar 2020 01:47:07 +0800 |
| Subject: [PATCH] ARM: dts: sun8i: r40: Move AHCI device node based on address |
| order |
| |
| commit fe3a04824f75786e39ed74e82fb6cb2534c95fe4 upstream. |
| |
| 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: 41c64d3318aa ("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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi |
| index bb856e53b806..072ca3ee58bf 100644 |
| --- a/arch/arm/boot/dts/sun8i-r40.dtsi |
| +++ b/arch/arm/boot/dts/sun8i-r40.dtsi |
| @@ -266,6 +266,16 @@ |
| #phy-cells = <1>; |
| }; |
| |
| + 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>; |
| @@ -552,17 +562,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>; |
| -- |
| 2.7.4 |
| |