[PATCH] arm64: dts: meson: add dwmac-3.70a to ethmac compatible list

[PATCH] arm64: dts: meson: add dwmac-3.70a to ethmac compatible list

[Jerome Brunet]

After discussing with Amlogic, the Synopsys GMAC version used by
the gx and axg family is the 3.70a. Set this is in DT

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---

 Hi,

 The same should be true for the meson8 families but I did not test
 it which is why only the patch only address the 64bits SoC families

 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 +++-
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index 38169c85e91f..6219337033a0 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -171,7 +171,9 @@
 		ranges;
 
 		ethmac: ethernet@ff3f0000 {
-			compatible = "amlogic,meson-axg-dwmac", "snps,dwmac";
+			compatible = "amlogic,meson-axg-dwmac",
+				     "snps,dwmac-3.70a",
+				     "snps,dwmac";
 			reg = <0x0 0xff3f0000 0x0 0x10000
 			       0x0 0xff634540 0x0 0x8>;
 			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 6772709b9e19..74d03fc706be 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -486,7 +486,9 @@
 		};
 
 		ethmac: ethernet@c9410000 {
-			compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
+			compatible = "amlogic,meson-gxbb-dwmac",
+				     "snps,dwmac-3.70a",
+				     "snps,dwmac";
 			reg = <0x0 0xc9410000 0x0 0x10000
 			       0x0 0xc8834540 0x0 0x4>;
 			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-- 
2.20.1

Re: [PATCH] arm64: dts: meson: add dwmac-3.70a to ethmac compatible list

[Martin Blumenstingl]

Hi Jerome,

On Fri, May 24, 2019 at 3:08 PM Jerome Brunet <jbrunet@baylibre.com> wrote:
>
> After discussing with Amlogic, the Synopsys GMAC version used by
> the gx and axg family is the 3.70a. Set this is in DT
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

> ---
>
>  Hi,
>
>  The same should be true for the meson8 families but I did not test
>  it which is why only the patch only address the 64bits SoC families
on one of my Meson8m2 boards:
User ID: 0x11, Synopsys ID: 0x37
-> that matches GXBB/GXL/GXM

Odroid-C1 on Kernel CI reports:
User ID: 0x10, Synopsys ID: 0x37
-> however, the public S805 datasheet mentions that it's a
"10/100/1000 MAC 3.70a" (page 120)

I don't know about Meson6 or Meson8 (as I don't have boards with these SoCs)

I'll put this on my to do list (adding the "snps,dwmac-3.70a"
compatible on Meson8b and Meson8m2)


Martin

Re: [PATCH] arm64: dts: meson: add dwmac-3.70a to ethmac compatible list

[Kevin Hilman]

Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes:

> Hi Jerome,
>
> On Fri, May 24, 2019 at 3:08 PM Jerome Brunet <jbrunet@baylibre.com> wrote:
>>
>> After discussing with Amlogic, the Synopsys GMAC version used by
>> the gx and axg family is the 3.70a. Set this is in DT
>>
>> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

Queued for v5.3, w/Martin's tag,

Thanks,

Kevin