On Tue, Nov 03, 2020 at 06:53:17AM +0100, Martin Blumenstingl wrote:
Hi Sasha, On Tue, Nov 3, 2020 at 2:20 AM Sasha Levin <sashal@xxxxxxxxxx> wrote:From: Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx> [ Upstream commit 1fdc97ae450ede2b4911d6737a57e6fca63b5f4a ] 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 <martin.blumenstingl@xxxxxxxxxxxxxx> Reviewed-by: Neil Armstrong <narmstrong@xxxxxxxxxxxx> Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxx> Link: https://lore.kernel.org/r/20200925211743.537496-1-martin.blumenstingl@xxxxxxxxxxxxxx Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>if this patch will be included in 5.4-stable then please also backport the following two commits: - 3efdb92426bf4 ("dt-bindings: net: dwmac-meson: Add a compatible string for G12A onwards") - a4f63342d03d2d ("net: stmmac: dwmac-meson8b: add a compatible string for G12A SoCs") Without these above two commits we'll lose Ethernet connectivity because there's no G12A compatible string in 5.4 yet The quick solution would be to not backport this patch because the driver in question doesn't do anything with the new compatible string yet.
I'll drop it from older branches that don't have those commits, thanks! -- Thanks, Sasha
