Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux-2.6-block.git] / arch / arm64 / boot / dts / freescale / fsl-ls1028a-qds.dts

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
index 5e14e5a197441ef97aec35c1905a09c8c47d335f..d98346da01df5d7ab4f7081e14151ec29210cd7b 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -85,6 +85,26 @@
                        system-clock-frequency = <25000000>;
                };
        };
+
+       mdio-mux {
+               compatible = "mdio-mux-multiplexer";
+               mux-controls = <&mux 0>;
+               mdio-parent-bus = <&enetc_mdio_pf3>;
+               #address-cells=<1>;
+               #size-cells = <0>;
+
+               /* on-board RGMII PHY */
+               mdio@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+
+                       qds_phy1: ethernet-phy@5 {
+                               /* Atheros 8035 */
+                               reg = <5>;
+                       };
+               };
+       };
 };
 
 &duart0 {
@@ -172,6 +192,26 @@
                        };
                };
        };
+
+       fpga@66 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "fsl,ls1028aqds-fpga", "fsl,fpga-qixis-i2c",
+                            "simple-mfd";
+               reg = <0x66>;
+
+               mux: mux-controller {
+                       compatible = "reg-mux";
+                       #mux-control-cells = <1>;
+                       mux-reg-masks = <0x54 0xf0>; /* 0: reg 0x54, bits 7:4 */
+               };
+       };
+
+};
+
+&enetc_port1 {
+       phy-handle = <&qds_phy1>;
+       phy-connection-type = "rgmii-id";
 };
 
 &sai1 {