Merge tag 'linux-kselftest-4.14-rc1-update' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / rockchip / rk3328.dtsi

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 0be96cee27bd107e5af9cecd8a72ffc6c1ca7b46..d48bf5d9f8bd04c03d21b9f2d7be42a654b0c15f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -63,6 +63,8 @@
                i2c1 = &i2c1;
                i2c2 = &i2c2;
                i2c3 = &i2c3;
+               ethernet0 = &gmac2io;
+               ethernet1 = &gmac2phy;
        };
 
        cpus {
@@ -424,6 +426,43 @@
                status = "disabled";
        };
 
+       gmac2phy: ethernet@ff550000 {
+               compatible = "rockchip,rk3328-gmac";
+               reg = <0x0 0xff550000 0x0 0x10000>;
+               rockchip,grf = <&grf>;
+               interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "macirq";
+               clocks = <&cru SCLK_MAC2PHY_SRC>, <&cru SCLK_MAC2PHY_RXTX>,
+                        <&cru SCLK_MAC2PHY_RXTX>, <&cru SCLK_MAC2PHY_REF>,
+                        <&cru ACLK_MAC2PHY>, <&cru PCLK_MAC2PHY>,
+                        <&cru SCLK_MAC2PHY_OUT>;
+               clock-names = "stmmaceth", "mac_clk_rx",
+                             "mac_clk_tx", "clk_mac_ref",
+                             "aclk_mac", "pclk_mac",
+                             "clk_macphy";
+               resets = <&cru SRST_GMAC2PHY_A>, <&cru SRST_MACPHY>;
+               reset-names = "stmmaceth", "mac-phy";
+               phy-mode = "rmii";
+               phy-handle = <&phy>;
+               status = "disabled";
+
+               mdio {
+                       compatible = "snps,dwmac-mdio";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       phy: phy@0 {
+                               compatible = "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22";
+                               reg = <0>;
+                               clocks = <&cru SCLK_MAC2PHY_OUT>;
+                               resets = <&cru SRST_MACPHY>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&fephyled_rxm1 &fephyled_linkm1>;
+                               phy-is-integrated;
+                       };
+               };
+       };
+
        gic: interrupt-controller@ff811000 {
                compatible = "arm,gic-400";
                #interrupt-cells = <3>;