From b672550b3234bacf347e1adefb529f87f799aada Mon Sep 17 00:00:00 2001 From: Matt Merhar Date: Wed, 29 Aug 2018 20:14:19 -0400 Subject: [PATCH] ath79: add syscon compatible property to ar7100 ethernet nodes This adds "syscon" to the compatible properties for the eth0/eth1 nodes in ar7100.dtsi. Without this, a kernel panic is encountered on boot with some ar7100 boards. This for some reason wasn't an issue for the WNDR3800, which uses a Realtek switch chipset, but the panic was encountered on the RouterStation Pro (using an AR8216 switch) and some other boards that haven't yet been merged. The panic message mentions an unaligned access and happens in ag71xx_mdio_probe in drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c. Even if the unaligned access is fixed, the ag71xx_mdio probe still fails without the "syscon" property. This was already being worked around in ar7161_ubnt_routerstation-pro.dts by overriding the compatible property, so this commit removes that as well. All of the other ath79 .dtsi already have this property, so no changes are needed elsewhere. Signed-off-by: Matt Merhar --- target/linux/ath79/dts/ar7100.dtsi | 4 ++-- target/linux/ath79/dts/ar7161_ubnt_routerstation-pro.dts | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi index 5d5c97cd89..982ad96484 100644 --- a/target/linux/ath79/dts/ar7100.dtsi +++ b/target/linux/ath79/dts/ar7100.dtsi @@ -182,7 +182,7 @@ }; ð0 { - compatible = "qca,ar7100-eth"; + compatible = "qca,ar7100-eth", "syscon"; reg = <0x19000000 0x200 0x18070000 0x4>; @@ -201,7 +201,7 @@ }; ð1 { - compatible = "qca,ar7100-eth"; + compatible = "qca,ar7100-eth", "syscon"; reg = <0x1a000000 0x200 0x18070004 0x4>; diff --git a/target/linux/ath79/dts/ar7161_ubnt_routerstation-pro.dts b/target/linux/ath79/dts/ar7161_ubnt_routerstation-pro.dts index 123d1efbf1..1ffb1239b9 100644 --- a/target/linux/ath79/dts/ar7161_ubnt_routerstation-pro.dts +++ b/target/linux/ath79/dts/ar7161_ubnt_routerstation-pro.dts @@ -21,13 +21,11 @@ }; ð0 { - compatible = "qca,ar7100-eth", "syscon"; phy-mode = "rgmii"; phy-handle = <&phy4>; }; ð1 { - compatible = "qca,ar7100-eth", "syscon"; phy-mode = "rgmii"; phy-handle = <&phy0>; };