Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c

+31 −18
Original line number Diff line number Diff line
@@ -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 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);

	if (!gmac)

		return ERR_PTR(-ENOMEM);

		return -ENOMEM;



	gmac->interface = of_get_phy_mode(dev->of_node);



	gmac->tx_clk = devm_clk_get(dev, "allwinner_gmac_tx");

	if (IS_ERR(gmac->tx_clk)) {

		dev_err(dev, "could not get tx clock\n");

		return gmac->tx_clk;

		return PTR_ERR(gmac->tx_clk);

	}



	/* Optional regulator for PHY */

	gmac->regulator = devm_regulator_get_optional(dev, "phy");

	if (IS_ERR(gmac->regulator)) {

		if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER)

			return ERR_PTR(-EPROBE_DEFER);

			return -EPROBE_DEFER;

		dev_info(dev, "no regulator found\n");

		gmac->regulator = NULL;

	}



	return gmac;

}



/* of_data specifying hardware features and callbacks.

	/* platform data specifying hardware features and callbacks.

	 * hardware features were copied from Allwinner drivers. */

static const struct stmmac_of_data sun7i_gmac_data = {

	.has_gmac = 1,

	.tx_coe = 1,

	.fix_mac_speed = sun7i_fix_speed,

	.setup = sun7i_gmac_setup,

	.init = sun7i_gmac_init,

	.exit = sun7i_gmac_exit,

};

	plat_dat->tx_coe = 1;

	plat_dat->has_gmac = true;

	plat_dat->bsp_priv = gmac;

	plat_dat->init = sun7i_gmac_init;

	plat_dat->exit = sun7i_gmac_exit;

	plat_dat->fix_mac_speed = sun7i_fix_speed;



	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[] = {

	{ .compatible = "allwinner,sun7i-a20-gmac", .data = &sun7i_gmac_data},

	{ .compatible = "allwinner,sun7i-a20-gmac" },

	{ }

};

MODULE_DEVICE_TABLE(of, sun7i_dwmac_match);



static struct platform_driver sun7i_dwmac_driver = {

	.probe  = stmmac_pltfr_probe,

	.probe  = sun7i_gmac_probe,

	.remove = stmmac_pltfr_remove,

	.driver = {

		.name           = "sun7i-dwmac",