ath79: fix pinmux for ar933x devices

[openwrt/staging/ynezz.git] / target / linux / ath79 / dts / ar9330.dtsi

diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index e1beacb27232ac6b9444b2df19a86dc9fef05b62..ca8d69c37156e126c1ea606dfe891df89650face 100644 (file)
--- 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_disable_pins: pinmux_switch_led_disable_pins {
+                                       pinctrl-single,bits = <0x0 0xf8 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>;
 
@@ -108,7 +126,7 @@
                        reg = <0x18070000 0x4>;
                };
 
-               wmac: gmac@18100000 {
+               wmac: wmac@18100000 {
                        compatible = "qca,ar9330-wmac";
                        reg = <0x18100000 0x20000>;
 
@@ -142,28 +160,48 @@
 
        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,ar7240sw";
+               reg = <0x1f>;
+               resets = <&rst 8>;
+               reset-names = "switch";
+               qca,mib-poll-interval = <500>;
+
+               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;
+       };
 };