Commit 8878adba authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 58d844e8 a4f63342
...@@ -22,6 +22,7 @@ select: ...@@ -22,6 +22,7 @@ select:
- amlogic,meson8m2-dwmac - amlogic,meson8m2-dwmac
- amlogic,meson-gxbb-dwmac - amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac - amlogic,meson-axg-dwmac
- amlogic,meson-g12a-dwmac
required: required:
- compatible - compatible
...@@ -36,6 +37,7 @@ allOf: ...@@ -36,6 +37,7 @@ allOf:
- amlogic,meson8m2-dwmac - amlogic,meson8m2-dwmac
- amlogic,meson-gxbb-dwmac - amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac - amlogic,meson-axg-dwmac
- amlogic,meson-g12a-dwmac
then: then:
properties: properties:
...@@ -95,6 +97,7 @@ properties: ...@@ -95,6 +97,7 @@ properties:
- amlogic,meson8m2-dwmac - amlogic,meson8m2-dwmac
- amlogic,meson-gxbb-dwmac - amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac - amlogic,meson-axg-dwmac
- amlogic,meson-g12a-dwmac
contains: contains:
enum: enum:
- snps,dwmac-3.70a - snps,dwmac-3.70a
......
...@@ -491,6 +491,10 @@ static const struct of_device_id meson8b_dwmac_match[] = { ...@@ -491,6 +491,10 @@ static const struct of_device_id meson8b_dwmac_match[] = {
.compatible = "amlogic,meson-axg-dwmac", .compatible = "amlogic,meson-axg-dwmac",
.data = &meson_axg_dwmac_data, .data = &meson_axg_dwmac_data,
}, },
{
.compatible = "amlogic,meson-g12a-dwmac",
.data = &meson_axg_dwmac_data,
},
{ } { }
}; };
MODULE_DEVICE_TABLE(of, meson8b_dwmac_match); MODULE_DEVICE_TABLE(of, meson8b_dwmac_match);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment