X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Fath79%2Fdts%2Far9330.dtsi;h=01116ff45a5fad2ba070e04bbd4611f95ee2bff1;hb=59c2f8af8c4400baffb09d6f8ab4d2826e38726a;hp=f62367264ff1f17ba000f5d86761daf499aa02fb;hpb=66c8afd115f4d03fefc0e650b90dd922487cc50f;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index f62367264f..01116ff45a 100644
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -61,6 +61,24 @@
 				status = "disabled";
 			};
 
+			pinmux: pinmux@18040028 {
+				compatible = "pinctrl-single";
+				reg = <0x18040028 0x8>;
+
+				pinctrl-single,bit-per-mux;
+				pinctrl-single,register-width = <32>;
+				pinctrl-single,function-mask = <0x1>;
+				#pinctrl-cells = <2>;
+
+				jtag_disable_pins: pinmux_jtag_disable_pins {
+					pinctrl-single,bits = <0x0 0x1 0x1>;
+				};
+
+				switch_led_pins: pinmux_switch_led_pins {
+					pinctrl-single,bits = <0x0 0x1f 0xf8>;
+				};
+			};
+
 			pll: pll-controller@18050000 {
 				compatible = "qca,ar9330-pll";
 				reg = <0x18050000 0x100>;
@@ -76,7 +94,7 @@
 			};
 		};
 
-		usb: usb@1b000100 {
+		usb: usb@1b000000 {
 			compatible = "chipidea,usb2";
 			reg = <0x1b000000 0x200>;
 
@@ -104,9 +122,18 @@
 		};
 
 		gmac: gmac@18070000 {
-			compatible = "qca,qr9330-gmac";
+			compatible = "qca,ar9330-gmac";
 			reg = <0x18070000 0x4>;
 		};
+
+		wmac: wmac@18100000 {
+			compatible = "qca,ar9330-wmac";
+			reg = <0x18100000 0x20000>;
+
+			interrupts = <2>;
+
+			status = "disabled";
+		};
 	};
 
 	usb_phy: usb-phy {
@@ -133,28 +160,47 @@
 
 	resets = <&rst 9>;
 	reset-names = "mac";
-};
-
-&mdio0 {
-	regmap = <&eth1>;
-	builtin-switch;
-	resets = <&rst 23>;
-	reset-names = "mdio";
+	phy-mode = "mii";
+	phy-handle = <&swphy4>;
 };
 
 &mdio1 {
+	status = "okay";
+	compatible = "qca,ar9330-mdio";
+
 	resets = <&rst 23>;
 	reset-names = "mdio";
-
 	builtin-switch;
+
+	builtin_switch: switch0@1f {
+		compatible = "qca,ar8216-builtin";
+		reg = <0x1f>;
+		resets = <&rst 8>;
+		reset-names = "switch";
+
+		mdio-bus {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			swphy4: ethernet-phy@4 {
+				reg = <4>;
+				phy-mode = "mii";
+			};
+		};
+	};
 };
 
 &eth1 {
-	compatible = "qca,ar9330-eth", "syscon";
+	compatible = "qca,ar9330-eth", "syscon", "simple-mfd";
 
 	pll-data = <0x00110000 0x00001099 0x00991099>;
 	phy-mode = "gmii";
 
 	resets = <&rst 13>;
 	reset-names = "mac";
+
+	fixed-link {
+		speed = <1000>;
+		full-duplex;
+	};
 };