Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk312x.dtsi

diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index c9dd4bf6d1da13f0f82beb6475d524b2a63b5598..826b5ad9ffe172aac1fa86d43799576df7735117 100755 (executable)
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -257,7 +257,6 @@
                        "mac_clk_tx", "clk_mac_ref",
                        "clk_mac_refout",
                        "pclk_mac";
-               //phy-mode = "rmii";
                phy-mode = "rgmii";
                pinctrl-names = "default";
                pinctrl-0 = <&gmac_rxdv &gmac_txclk &gmac_crs &gmac_rxclk &gmac_mdio &gmac_txen &gmac_clk &gmac_rxer &gmac_rxd1 &gmac_rxd0 &gmac_txd1 &gmac_txd0 &gmac_rxd3 &gmac_rxd2 &gmac_txd2 &gmac_txd3 &gmac_col_gpio &gmac_mdc>;