Commit 9a9e9a1e authored by Joachim Eastwood's avatar Joachim Eastwood Committed by David S. Miller

stmmac: dwmac-sunxi: turn setup callback into a probe function

By using a few functions from stmmac_platform a proper probe
function can be created from the setup glue callback. This
makes it look more like a standard driver and the OF match
data can also be dropped.
Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22caae03
...@@ -103,54 +103,67 @@ static void sun7i_fix_speed(void *priv, unsigned int speed) ...@@ -103,54 +103,67 @@ static void sun7i_fix_speed(void *priv, unsigned int speed)
} }
} }
static void *sun7i_gmac_setup(struct platform_device *pdev) static int sun7i_gmac_probe(struct platform_device *pdev)
{ {
struct plat_stmmacenet_data *plat_dat;
struct stmmac_resources stmmac_res;
struct sunxi_priv_data *gmac; struct sunxi_priv_data *gmac;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int ret;
ret = stmmac_get_platform_resources(pdev, &stmmac_res);
if (ret)
return ret;
plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac);
if (IS_ERR(plat_dat))
return PTR_ERR(plat_dat);
gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL); gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL);
if (!gmac) if (!gmac)
return ERR_PTR(-ENOMEM); return -ENOMEM;
gmac->interface = of_get_phy_mode(dev->of_node); gmac->interface = of_get_phy_mode(dev->of_node);
gmac->tx_clk = devm_clk_get(dev, "allwinner_gmac_tx"); gmac->tx_clk = devm_clk_get(dev, "allwinner_gmac_tx");
if (IS_ERR(gmac->tx_clk)) { if (IS_ERR(gmac->tx_clk)) {
dev_err(dev, "could not get tx clock\n"); dev_err(dev, "could not get tx clock\n");
return gmac->tx_clk; return PTR_ERR(gmac->tx_clk);
} }
/* Optional regulator for PHY */ /* Optional regulator for PHY */
gmac->regulator = devm_regulator_get_optional(dev, "phy"); gmac->regulator = devm_regulator_get_optional(dev, "phy");
if (IS_ERR(gmac->regulator)) { if (IS_ERR(gmac->regulator)) {
if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER) if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER)
return ERR_PTR(-EPROBE_DEFER); return -EPROBE_DEFER;
dev_info(dev, "no regulator found\n"); dev_info(dev, "no regulator found\n");
gmac->regulator = NULL; gmac->regulator = NULL;
} }
return gmac; /* platform data specifying hardware features and callbacks.
}
/* of_data specifying hardware features and callbacks.
* hardware features were copied from Allwinner drivers. */ * hardware features were copied from Allwinner drivers. */
static const struct stmmac_of_data sun7i_gmac_data = { plat_dat->tx_coe = 1;
.has_gmac = 1, plat_dat->has_gmac = true;
.tx_coe = 1, plat_dat->bsp_priv = gmac;
.fix_mac_speed = sun7i_fix_speed, plat_dat->init = sun7i_gmac_init;
.setup = sun7i_gmac_setup, plat_dat->exit = sun7i_gmac_exit;
.init = sun7i_gmac_init, plat_dat->fix_mac_speed = sun7i_fix_speed;
.exit = sun7i_gmac_exit,
}; ret = sun7i_gmac_init(pdev, plat_dat->bsp_priv);
if (ret)
return ret;
return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
}
static const struct of_device_id sun7i_dwmac_match[] = { static const struct of_device_id sun7i_dwmac_match[] = {
{ .compatible = "allwinner,sun7i-a20-gmac", .data = &sun7i_gmac_data}, { .compatible = "allwinner,sun7i-a20-gmac" },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, sun7i_dwmac_match); MODULE_DEVICE_TABLE(of, sun7i_dwmac_match);
static struct platform_driver sun7i_dwmac_driver = { static struct platform_driver sun7i_dwmac_driver = {
.probe = stmmac_pltfr_probe, .probe = sun7i_gmac_probe,
.remove = stmmac_pltfr_remove, .remove = stmmac_pltfr_remove,
.driver = { .driver = {
.name = "sun7i-dwmac", .name = "sun7i-dwmac",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment