|
@@ -901,13 +901,6 @@ static void rk_gmac_powerdown(struct rk_priv_data *gmac)
|
|
gmac_clk_enable(gmac, false);
|
|
gmac_clk_enable(gmac, false);
|
|
}
|
|
}
|
|
|
|
|
|
-static int rk_gmac_init(struct platform_device *pdev, void *priv)
|
|
|
|
-{
|
|
|
|
- struct rk_priv_data *bsp_priv = priv;
|
|
|
|
-
|
|
|
|
- return rk_gmac_powerup(bsp_priv);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static void rk_fix_speed(void *priv, unsigned int speed)
|
|
static void rk_fix_speed(void *priv, unsigned int speed)
|
|
{
|
|
{
|
|
struct rk_priv_data *bsp_priv = priv;
|
|
struct rk_priv_data *bsp_priv = priv;
|
|
@@ -943,14 +936,13 @@ static int rk_gmac_probe(struct platform_device *pdev)
|
|
return PTR_ERR(plat_dat);
|
|
return PTR_ERR(plat_dat);
|
|
|
|
|
|
plat_dat->has_gmac = true;
|
|
plat_dat->has_gmac = true;
|
|
- plat_dat->init = rk_gmac_init;
|
|
|
|
plat_dat->fix_mac_speed = rk_fix_speed;
|
|
plat_dat->fix_mac_speed = rk_fix_speed;
|
|
|
|
|
|
plat_dat->bsp_priv = rk_gmac_setup(pdev, data);
|
|
plat_dat->bsp_priv = rk_gmac_setup(pdev, data);
|
|
if (IS_ERR(plat_dat->bsp_priv))
|
|
if (IS_ERR(plat_dat->bsp_priv))
|
|
return PTR_ERR(plat_dat->bsp_priv);
|
|
return PTR_ERR(plat_dat->bsp_priv);
|
|
|
|
|
|
- ret = rk_gmac_init(pdev, plat_dat->bsp_priv);
|
|
|
|
|
|
+ ret = rk_gmac_powerup(plat_dat->bsp_priv);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
|
|
|