Skip to content

Commit ae396da

Browse files
xdarklightgregkh
authored andcommitted
arm64: dts: amlogic: meson-g12: use the G12A specific dwmac compatible
[ Upstream commit 1fdc97a ] We have a dedicated "amlogic,meson-g12a-dwmac" compatible string for the Ethernet controller since commit 3efdb92 ("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@googlemail.com> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com> Link: https://lore.kernel.org/r/20200925211743.537496-1-martin.blumenstingl@googlemail.com Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent cd53a81 commit ae396da

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
};
210210

211211
ethmac: ethernet@ff3f0000 {
212-
compatible = "amlogic,meson-axg-dwmac",
212+
compatible = "amlogic,meson-g12a-dwmac",
213213
"snps,dwmac-3.70a",
214214
"snps,dwmac";
215215
reg = <0x0 0xff3f0000 0x0 0x10000>,

0 commit comments

Comments
 (0)