[openwrt/openwrt] ath79: fix gmac compatible in ar9330.dtsi and ag71xx_setup_gmac_933x

[LEDE Commits]

blogic pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/c15dfbeea004d2e5e0710f4216590d4207bbc998

commit c15dfbeea004d2e5e0710f4216590d4207bbc998
Author: Johann Neuhauser <johann at it-neuhauser.de>
AuthorDate: Sat May 12 22:25:35 2018 +0200

    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 <johann at it-neuhauser.de>
---
 target/linux/ath79/dts/ar9330.dtsi                                      | 2 +-
 .../linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index f623672..1439de1 100644
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -104,7 +104,7 @@
 		};
 
 		gmac: gmac at 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 9ccfb00..3c07adb 100644
--- 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);