aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohann Neuhauser <johann@it-neuhauser.de>2018-05-12 22:25:35 +0200
committerJohn Crispin <john@phrozen.org>2018-05-15 06:38:07 +0200
commitc15dfbeea004d2e5e0710f4216590d4207bbc998 (patch)
tree25584b485c8b3a24a7c0020afbd6319da3ceaf9f
parent96f4792fdb036ecf5c8417fce6503412b0b27e5f (diff)
downloadupstream-c15dfbeea004d2e5e0710f4216590d4207bbc998.tar.gz
upstream-c15dfbeea004d2e5e0710f4216590d4207bbc998.tar.bz2
upstream-c15dfbeea004d2e5e0710f4216590d4207bbc998.zip
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@it-neuhauser.de>
-rw-r--r--target/linux/ath79/dts/ar9330.dtsi2
-rw-r--r--target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index f62367264f..1439de1e66 100644
--- 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 9ccfb00c3a..3c07adb680 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);