Message ID | 20210421091809.3103002-2-narmstrong@baylibre.com |
---|---|
State | Accepted |
Commit | 4c2eb955cfd77d667485c5141cda2821aa1f97ef |
Delegated to: | Neil Armstrong |
Headers | show |
Series | [1/8] ARM: meson: Sync Amlogic DT from Linux 5.12-rc2 | expand |
On Wed, Apr 21, 2021 at 12:18 PM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Add support for the Meson G12A dwmac glue compatible needed after Linux 5.12 sync. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/net/dwmac_meson8b.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/dwmac_meson8b.c b/drivers/net/dwmac_meson8b.c > index c0b6ef4994..069bf1724d 100644 > --- a/drivers/net/dwmac_meson8b.c > +++ b/drivers/net/dwmac_meson8b.c > @@ -133,6 +133,7 @@ static int dwmac_meson8b_probe(struct udevice *dev) > > static const struct udevice_id dwmac_meson8b_ids[] = { > { .compatible = "amlogic,meson-gxbb-dwmac", .data = (ulong)dwmac_setup_gx }, > + { .compatible = "amlogic,meson-g12a-dwmac", .data = (ulong)dwmac_setup_axg }, > { .compatible = "amlogic,meson-axg-dwmac", .data = (ulong)dwmac_setup_axg }, > { } > }; > -- > 2.25.1 > Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
On 21/04/2021 11:18, Neil Armstrong wrote: > Add support for the Meson G12A dwmac glue compatible needed after Linux 5.12 sync. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/net/dwmac_meson8b.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/dwmac_meson8b.c b/drivers/net/dwmac_meson8b.c > index c0b6ef4994..069bf1724d 100644 > --- a/drivers/net/dwmac_meson8b.c > +++ b/drivers/net/dwmac_meson8b.c > @@ -133,6 +133,7 @@ static int dwmac_meson8b_probe(struct udevice *dev) > > static const struct udevice_id dwmac_meson8b_ids[] = { > { .compatible = "amlogic,meson-gxbb-dwmac", .data = (ulong)dwmac_setup_gx }, > + { .compatible = "amlogic,meson-g12a-dwmac", .data = (ulong)dwmac_setup_axg }, > { .compatible = "amlogic,meson-axg-dwmac", .data = (ulong)dwmac_setup_axg }, > { } > }; > Thanks, Applied to u-boot-amlogic Neil
diff --git a/drivers/net/dwmac_meson8b.c b/drivers/net/dwmac_meson8b.c index c0b6ef4994..069bf1724d 100644 --- a/drivers/net/dwmac_meson8b.c +++ b/drivers/net/dwmac_meson8b.c @@ -133,6 +133,7 @@ static int dwmac_meson8b_probe(struct udevice *dev) static const struct udevice_id dwmac_meson8b_ids[] = { { .compatible = "amlogic,meson-gxbb-dwmac", .data = (ulong)dwmac_setup_gx }, + { .compatible = "amlogic,meson-g12a-dwmac", .data = (ulong)dwmac_setup_axg }, { .compatible = "amlogic,meson-axg-dwmac", .data = (ulong)dwmac_setup_axg }, { } };
Add support for the Meson G12A dwmac glue compatible needed after Linux 5.12 sync. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/net/dwmac_meson8b.c | 1 + 1 file changed, 1 insertion(+)