gmac: move drive strength control from driver to dts

diff --git a/arch/arm/boot/dts/rk3288-tb_8846.dts b/arch/arm/boot/dts/rk3288-tb_8846.dts
index 5188c021571e340143b4e06403b59818dbe7ce10..70cf2835c9d26790e6abb6070f540afefdc46db0 100644 (file)
--- a/arch/arm/boot/dts/rk3288-tb_8846.dts
+++ b/arch/arm/boot/dts/rk3288-tb_8846.dts
@@ -220,6 +220,28 @@
                
        //could add other pinctrl definition such as gpio
 
+       // gmac drive strength
+       gpio4_gmac {
+               mac_clk: mac-clk {
+                       rockchip,drive = <VALUE_DRV_12MA>;
+               };
+
+               mac_txpins: mac-txpins {
+                       rockchip,drive = <VALUE_DRV_12MA>;
+               };
+
+               mac_rxpins: mac-rxpins {
+                       rockchip,drive = <VALUE_DRV_12MA>;
+               };
+
+               mac_crs: mac-crs {
+                       rockchip,drive = <VALUE_DRV_12MA>;
+               };
+
+               mac_mdpins: mac-mdpins {
+                       rockchip,drive = <VALUE_DRV_12MA>;
+               };
+       };
 };
 
 &nandc0 {

diff --git a/drivers/net/ethernet/rockchip/gmac/stmmac_platform.c b/drivers/net/ethernet/rockchip/gmac/stmmac_platform.c
index 471bfe71b70e70a9bee3d9ef8d44570fa380a0bb..b37c6198fcc1fed0931c8db60d424171dfd4bfdb 100755 (executable)
--- a/drivers/net/ethernet/rockchip/gmac/stmmac_platform.c
+++ b/drivers/net/ethernet/rockchip/gmac/stmmac_platform.c
@@ -162,9 +162,6 @@ int stmmc_pltfr_init(struct platform_device *pdev) {
                grf_writel(GMAC_TXCLK_DLY_ENABLE, RK3288_GRF_SOC_CON3);
                grf_writel(GMAC_CLK_RX_DL_CFG(0x10), RK3288_GRF_SOC_CON3);
                grf_writel(GMAC_CLK_TX_DL_CFG(0x30), RK3288_GRF_SOC_CON3);
-               grf_writel(0xffffffff,RK3288_GRF_GPIO3D_E);
-               grf_writel(grf_readl(RK3288_GRF_GPIO4B_E) | 0x3<<2<<16 | 0x3<<2, RK3288_GRF_GPIO4B_E);
-               grf_writel(0xffffffff,RK3288_GRF_GPIO4A_E);
 
        } else if (phy_iface == PHY_INTERFACE_MODE_RMII) {
                pr_info("%s: init for RMII\n", __func__);