X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Fath79%2Fdts%2Far934x.dtsi;h=3eed4de7993ba6c41144a403ef7c67e11e852ae6;hb=34b10b468e0999f1739931ae8faf7e8e1002c2e8;hp=b8a915f36cf94eb762abdfb29c1fc67653902544;hpb=a7e1e919afa9659f66dada5e69d1b162f447ced7;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi
index b8a915f36c..3eed4de799 100644
--- a/target/linux/ath79/dts/ar934x.dtsi
+++ b/target/linux/ath79/dts/ar934x.dtsi
@@ -135,9 +135,16 @@
 			};
 
 			gmac: gmac@18070000 {
-				compatible = "qca,ar9340-gmac", "qca,ar9330-gmac";
+				compatible = "qca,ar9340-gmac";
 				reg = <0x18070000 0x14>;
 			};
+
+			wmac: wmac@18100000 {
+				compatible = "qca,ar9340-wmac";
+				reg = <0x18100000 0x20000>;
+
+				status = "disabled";
+			};
 		};
 
 		usb: usb@1b000000 {
@@ -183,37 +190,66 @@
 	};
 };
 
-&cpuintc {
-	qca,ddr-wb-channel-interrupts = <2>, <3>, <4>, <5>;
-	qca,ddr-wb-channels = <&ddr_ctrl 3>, <&ddr_ctrl 2>,
-				<&ddr_ctrl 0>, <&ddr_ctrl 1>;
-};
-
 &mdio0 {
+	compatible = "qca,ar9340-mdio";
 	resets = <&rst 22>;
 	reset-names = "mdio";
 };
 
 &eth0 {
-	compatible = "qca,ar9340-eth", "syscon";
+	compatible = "qca,ar9340-eth", "syscon", "simple-mfd";
 
 	pll-data = <0x16000000 0x00000101 0x00001616>;
 	pll-reg = <0x4 0x2c 17>;
 	pll-handle = <&pll>;
 
-	resets = <&rst 8>, <&rst 9>;
-	reset-names = "mac", "phy";
+	resets = <&rst 9>;
+	reset-names = "mac";
 };
 
 &mdio1 {
+	status = "okay";
+
+	compatible = "qca,ar9340-mdio";
 	resets = <&rst 23>;
 	reset-names = "mdio";
 	builtin-switch;
+
+	builtin_switch: switch0@1f {
+		compatible = "qca,ar8229-builtin";
+
+		reg = <0x1f>;
+		resets = <&rst 8>;
+		reset-names = "switch";
+		phy-mode = "gmii";
+		phy4-mii-enable;
+
+		mdio-bus {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			swphy0: ethernet-phy@0 {
+				reg = <0>;
+				phy-mode = "mii";
+			};
+
+			swphy4: ethernet-phy@4 {
+				reg = <4>;
+				phy-mode = "mii";
+			};
+		};
+	};
 };
 
 &eth1 {
-	compatible = "qca,ar9340-eth", "syscon";
+	compatible = "qca,ar9340-eth", "syscon", "simple-mfd";
 
-	resets = <&rst 12>, <&rst 13>;
-	reset-names = "mac", "phy";
+	resets = <&rst 13>;
+	reset-names = "mac";
+	phy-mode = "gmii";
+
+	fixed-link {
+		speed = <1000>;
+		full-duplex;
+	};
 };