aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuanhong Guo <gch981213@gmail.com>2018-07-17 17:09:14 +0800
committerJohn Crispin <john@phrozen.org>2018-07-30 10:43:34 +0200
commit113b4cf90ffafa403adf917d24c3245246eaa398 (patch)
treec8304335b852cc24c74a5792e401c52172257de5
parentb6c8e5deaef86419b870047de9935814de7c71ba (diff)
downloadupstream-113b4cf90ffafa403adf917d24c3245246eaa398.tar.gz
upstream-113b4cf90ffafa403adf917d24c3245246eaa398.tar.bz2
upstream-113b4cf90ffafa403adf917d24c3245246eaa398.zip
ath79: ar7241: Update dts for current ag71xx driver
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
-rw-r--r--target/linux/ath79/dts/ar7241.dtsi28
-rw-r--r--target/linux/ath79/dts/ar7241_tp-link.dtsi11
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts2
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts2
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_unifi.dts12
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_xm.dtsi12
6 files changed, 23 insertions, 44 deletions
diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi
index 91ebea54e0..baf34e28a6 100644
--- a/target/linux/ath79/dts/ar7241.dtsi
+++ b/target/linux/ath79/dts/ar7241.dtsi
@@ -39,13 +39,6 @@
};
};
-&mdio0 {
- regmap = <&eth1>;
- builtin-switch;
- resets = <&rst 22>;
- reset-names = "mdio";
-};
-
&eth0 {
compatible = "qca,ar7241-eth", "syscon";
@@ -53,16 +46,35 @@
resets = <&rst 8>, <&rst 9>;
reset-names = "mac", "phy";
+ phy-mode = "mii";
+ phy-handle = <&swphy4>;
};
&mdio1 {
+ status = "okay";
+
resets = <&rst 23>;
reset-names = "mdio";
builtin-switch;
+
+ builtin_switch: switch0@1f {
+ compatible = "qca,ar8216-builtin";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ reg = <0x1f>;
+
+ mdio-bus {
+ swphy4: ethernet-phy@4 {
+ reg = <4>;
+ phy-mode = "mii";
+ };
+ };
+ };
};
&eth1 {
- compatible = "qca,ar7241-eth", "syscon";
+ compatible = "qca,ar7241-eth", "syscon", "simple-mfd";
pll-data = <0x00110000 0x00001099 0x00991099>;
diff --git a/target/linux/ath79/dts/ar7241_tp-link.dtsi b/target/linux/ath79/dts/ar7241_tp-link.dtsi
index 3846d811ac..6cc515b7cc 100644
--- a/target/linux/ath79/dts/ar7241_tp-link.dtsi
+++ b/target/linux/ath79/dts/ar7241_tp-link.dtsi
@@ -97,8 +97,6 @@
&eth0 {
status = "okay";
- phy-handle = <&phy4>;
-
mtd-mac-address = <&uboot 0x1fc00>;
mtd-mac-address-increment = <(-1)>;
};
@@ -110,15 +108,6 @@
mtd-mac-address-increment = <1>;
};
-&mdio0 {
- status = "okay";
-
- phy4: ethernet-phy@4 {
- reg = <4>;
- phy-mode = "mii";
- };
-};
-
&gpio {
status = "okay";
};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
index 0de97ea933..33790f2e1c 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
@@ -9,5 +9,5 @@
};
&eth1 {
- compatible = "syscon";
+ compatible = "syscon", "simple-mfd";
};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
index 36fa2750a7..4053147c9c 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
@@ -9,7 +9,7 @@
};
&eth1 {
- compatible = "syscon";
+ compatible = "syscon", "simple-mfd";
};
&usb_phy {
diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index adcaf748bb..7294fb4ac8 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -117,24 +117,14 @@
};
};
-&mdio0 {
- status = "okay";
-
- phy4: ethernet-phy@4 {
- reg = <4>;
- phy-mode = "mii";
- };
-};
-
&eth0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
- phy-handle = <&phy4>;
};
&eth1 {
status = "okay";
- compatible = "syscon";
+ compatible = "syscon", "simple-mfd";
};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
index a08c9da846..e07e9c662b 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
@@ -122,22 +122,10 @@
};
};
-&mdio0 {
- status = "okay";
-
- phy4: ethernet-phy@4 {
- reg = <4>;
- phy-mode = "mii";
- };
-};
-
&eth0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
-
- phy-mode = "mii";
- phy-handle = <&phy4>;
};
&eth1 {