diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-06-22 16:24:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-22 16:24:10 -0700 |
| commit | 8878adba6ab5414c36b693e09fe46c4416072cc7 (patch) | |
| tree | 8d248aeb0c5d29369d790e6d73139f29902676c4 | |
| parent | Merge branch 'devlink-Add-board-serial_number-field-to-info_get-cb' (diff) | |
| parent | net: stmmac: dwmac-meson8b: add a compatible string for G12A SoCs (diff) | |
| download | wireguard-linux-8878adba6ab5414c36b693e09fe46c4416072cc7.tar.xz wireguard-linux-8878adba6ab5414c36b693e09fe46c4416072cc7.zip | |
Merge branch 'prepare-dwmac-meson8b-for-G12A-specific-initialization'
Martin Blumenstingl says:
====================
prepare dwmac-meson8b for G12A specific initialization
Some users are reporting that RGMII (and sometimes also RMII) Ethernet
is not working for them on G12A/G12B/SM1 boards. Upon closer inspection
of the vendor code for these SoCs new register bits are found.
It's not clear yet how these registers work. Add a new compatible string
as the first preparation step to improve Ethernet support on these SoCs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml index 64c20c92c07d..85fefe3a0444 100644 --- a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml @@ -22,6 +22,7 @@ select: - amlogic,meson8m2-dwmac - amlogic,meson-gxbb-dwmac - amlogic,meson-axg-dwmac + - amlogic,meson-g12a-dwmac required: - compatible @@ -36,6 +37,7 @@ allOf: - amlogic,meson8m2-dwmac - amlogic,meson-gxbb-dwmac - amlogic,meson-axg-dwmac + - amlogic,meson-g12a-dwmac then: properties: @@ -95,6 +97,7 @@ properties: - amlogic,meson8m2-dwmac - amlogic,meson-gxbb-dwmac - amlogic,meson-axg-dwmac + - amlogic,meson-g12a-dwmac contains: enum: - snps,dwmac-3.70a diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c index 234e8b6816ce..544bc621146c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c @@ -491,6 +491,10 @@ static const struct of_device_id meson8b_dwmac_match[] = { .compatible = "amlogic,meson-axg-dwmac", .data = &meson_axg_dwmac_data, }, + { + .compatible = "amlogic,meson-g12a-dwmac", + .data = &meson_axg_dwmac_data, + }, { } }; MODULE_DEVICE_TABLE(of, meson8b_dwmac_match); |