2020-03-10 17:47:55

by Chen-Yu Tsai

Subject: [PATCH 1/3] ARM: dts: sun8i: r40: Move AHCI device node based on address order

From: Chen-Yu Tsai <[email protected]>

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")
Signed-off-by: Chen-Yu Tsai <[email protected]>
---
arch/arm/boot/dts/sun8i-r40.dtsi | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
index d5442b5b6fd2..b278686d0c22 100644
--- a/arch/arm/boot/dts/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi
@@ -307,6 +307,17 @@ crypto: crypto@1c15000 {
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>;
@@ -733,17 +744,6 @@ spi3: spi@1c0f000 {
#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.25.1

2020-03-11 11:00:17

by Andre Przywara

Subject: Re: [PATCH 1/3] ARM: dts: sun8i: r40: Move AHCI device node based on address order

On Wed, 11 Mar 2020 01:47:07 +0800
Chen-Yu Tsai <[email protected]> wrote:

> From: Chen-Yu Tsai <[email protected]>
>
> 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")
> Signed-off-by: Chen-Yu Tsai <[email protected]>
> ---
> arch/arm/boot/dts/sun8i-r40.dtsi | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
> index d5442b5b6fd2..b278686d0c22 100644
> --- a/arch/arm/boot/dts/sun8i-r40.dtsi
> +++ b/arch/arm/boot/dts/sun8i-r40.dtsi
> @@ -307,6 +307,17 @@ crypto: crypto@1c15000 {
> 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";
> +

Did this empty line serve any particular purpose before? If not, you could remove it on the way.

With that fixed:

Reviewed-by: Andre Przywara <[email protected]>

Thanks,
Andre.

> + };
> +
> ehci1: usb@1c19000 {
> compatible = "allwinner,sun8i-r40-ehci", "generic-ehci";
> reg = <0x01c19000 0x100>;
> @@ -733,17 +744,6 @@ spi3: spi@1c0f000 {
> #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>;

2020-03-11 14:48:06

by Chen-Yu Tsai

Subject: Re: [PATCH 1/3] ARM: dts: sun8i: r40: Move AHCI device node based on address order

On Wed, Mar 11, 2020 at 6:59 PM Andre Przywara <[email protected]> wrote:
>
> On Wed, 11 Mar 2020 01:47:07 +0800
> Chen-Yu Tsai <[email protected]> wrote:
>
> > From: Chen-Yu Tsai <[email protected]>
> >
> > 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")
> > Signed-off-by: Chen-Yu Tsai <[email protected]>
> > ---
> > arch/arm/boot/dts/sun8i-r40.dtsi | 22 +++++++++++-----------
> > 1 file changed, 11 insertions(+), 11 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
> > index d5442b5b6fd2..b278686d0c22 100644
> > --- a/arch/arm/boot/dts/sun8i-r40.dtsi
> > +++ b/arch/arm/boot/dts/sun8i-r40.dtsi
> > @@ -307,6 +307,17 @@ crypto: crypto@1c15000 {
> > 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";
> > +
>
> Did this empty line serve any particular purpose before? If not, you could remove it on the way.

Can't say there is. Removed when applied.

> With that fixed:
>
> Reviewed-by: Andre Przywara <[email protected]>
>
> Thanks,
> Andre.

Thanks
ChenYu

> > + };
> > +
> > ehci1: usb@1c19000 {
> > compatible = "allwinner,sun8i-r40-ehci", "generic-ehci";
> > reg = <0x01c19000 0x100>;
> > @@ -733,17 +744,6 @@ spi3: spi@1c0f000 {
> > #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>;
>