ath79: fix gmac compatible in ar9330.dtsi and ag71xx_setup_gmac_933x

1. compatible property in node gmac was wrong

2. ag71xx_setup_gmac_933x should use np of gmac-config and
   not the pointer to gmac. gmac is only used for the reg address.

Signed-off-by: Johann Neuhauser <[email protected]>

diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index f62367264ff1f17ba000f5d86761daf499aa02fb..1439de1e6683a1bd38a03e83f14eb4b51559202e 100644 (file)
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -104,7 +104,7 @@
                };
 
                gmac: gmac@18070000 {
-                       compatible = "qca,qr9330-gmac";
+                       compatible = "qca,ar9330-gmac";
                        reg = <0x18070000 0x4>;
                };
        };

diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
index 9ccfb00c3a2c956dd7eaffd769ceb0e38fddaec2..3c07adb6809f4fc5492bc1e600f36dd60da8ab0a 100644 (file)
--- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -1317,7 +1317,7 @@ static int ag71xx_setup_gmac(struct device_node *np)
        }
 
        if (of_device_is_compatible(np_dev, "qca,ar9330-gmac"))
-               ag71xx_setup_gmac_933x(np_dev, base);
+               ag71xx_setup_gmac_933x(np, base);
 
        iounmap(base);