2020-09-25 21:19:39

by Martin Blumenstingl

Subject: [PATCH] arm64: dts: amlogic: meson-g12: use the G12A specific dwmac compatible

We have a dedicated "amlogic,meson-g12a-dwmac" compatible string for the
Ethernet controller since commit 3efdb92426bf4 ("dt-bindings: net:
dwmac-meson: Add a compatible string for G12A onwards").
Using the AXG compatible string worked fine so far because the
dwmac-meson8b driver doesn't handle the newly introduced register bits
for G12A. However, once that changes the driver must be probed with the
correct compatible string to manage these new register bits.

Signed-off-by: Martin Blumenstingl <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index 1e83ec5b8c91..d4e7cd68170a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -209,7 +209,7 @@ map {
};

ethmac: ethernet@ff3f0000 {
- compatible = "amlogic,meson-axg-dwmac",
+ compatible = "amlogic,meson-g12a-dwmac",
"snps,dwmac-3.70a",
"snps,dwmac";
reg = <0x0 0xff3f0000 0x0 0x10000>,
--
2.28.0

2020-09-28 07:57:47

by Neil Armstrong

Subject: Re: [PATCH] arm64: dts: amlogic: meson-g12: use the G12A specific dwmac compatible

On 25/09/2020 23:17, Martin Blumenstingl wrote:
> We have a dedicated "amlogic,meson-g12a-dwmac" compatible string for the
> Ethernet controller since commit 3efdb92426bf4 ("dt-bindings: net:
> dwmac-meson: Add a compatible string for G12A onwards").
> Using the AXG compatible string worked fine so far because the
> dwmac-meson8b driver doesn't handle the newly introduced register bits
> for G12A. However, once that changes the driver must be probed with the
> correct compatible string to manage these new register bits.
>
> Signed-off-by: Martin Blumenstingl <[email protected]>
> ---
> arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> index 1e83ec5b8c91..d4e7cd68170a 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> @@ -209,7 +209,7 @@ map {
> };
>
> ethmac: ethernet@ff3f0000 {
> - compatible = "amlogic,meson-axg-dwmac",
> + compatible = "amlogic,meson-g12a-dwmac",
> "snps,dwmac-3.70a",
> "snps,dwmac";
> reg = <0x0 0xff3f0000 0x0 0x10000>,
>

Reviewed-by: Neil Armstrong <[email protected]>

2020-10-02 18:53:24

by Kevin Hilman

Subject: Re: [PATCH] arm64: dts: amlogic: meson-g12: use the G12A specific dwmac compatible

On Fri, 25 Sep 2020 23:17:43 +0200, Martin Blumenstingl wrote:
> We have a dedicated "amlogic,meson-g12a-dwmac" compatible string for the
> Ethernet controller since commit 3efdb92426bf4 ("dt-bindings: net:
> dwmac-meson: Add a compatible string for G12A onwards").
> Using the AXG compatible string worked fine so far because the
> dwmac-meson8b driver doesn't handle the newly introduced register bits
> for G12A. However, once that changes the driver must be probed with the
> correct compatible string to manage these new register bits.

Applied, thanks!

[1/1] arm64: dts: amlogic: meson-g12: use the G12A specific dwmac compatible
commit: c0c6f8e527a652d4785cb38ac82be0c95913349d

Best regards,
--
Kevin Hilman <[email protected]>