From acbaa08812980f678191efdb3cda10cec3ba4848 Mon Sep 17 00:00:00 2001 From: hwg Date: Tue, 12 Aug 2014 10:49:04 +0800 Subject: [PATCH] gmac: move drive strength control from driver to dts --- arch/arm/boot/dts/rk3288-tb_8846.dts | 22 +++++++++++++++++++ .../ethernet/rockchip/gmac/stmmac_platform.c | 3 --- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-tb_8846.dts b/arch/arm/boot/dts/rk3288-tb_8846.dts index 5188c021571e..70cf2835c9d2 100644 --- 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 = ; + }; + + mac_txpins: mac-txpins { + rockchip,drive = ; + }; + + mac_rxpins: mac-rxpins { + rockchip,drive = ; + }; + + mac_crs: mac-crs { + rockchip,drive = ; + }; + + mac_mdpins: mac-mdpins { + rockchip,drive = ; + }; + }; }; &nandc0 { diff --git a/drivers/net/ethernet/rockchip/gmac/stmmac_platform.c b/drivers/net/ethernet/rockchip/gmac/stmmac_platform.c index 471bfe71b70e..b37c6198fcc1 100755 --- 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__); -- 2.34.1