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

Commit f4e9f3d2 authored by Fabio Estevam's avatar Fabio Estevam Committed by David S. Miller
Browse files

fec: Place the phy regulator in the private structure 



Instead of using a local reg_phy structure, let's put it inside the private
structure, so that we are able to have access to the regulator structure even
when we are outside fec_probe().

This is in preparation for controlling the FEC PHY regulator in the suspend and
resume functions.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3904dcc4

drivers/net/ethernet/freescale/fec.h

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ struct fec_enet_private { 
	int hwts_tx_en;

	struct timer_list time_keep;

	struct fec_enet_delayed_work delay_work;

	struct regulator *reg_phy;

};



void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev);

drivers/net/ethernet/freescale/fec_main.c

+3 −4
Original line number Diff line number Diff line
@@ -1840,7 +1840,6 @@ fec_probe(struct platform_device *pdev) 
	struct resource *r;

	const struct of_device_id *of_id;

	static int dev_id;

	struct regulator *reg_phy;



	of_id = of_match_device(fec_dt_ids, &pdev->dev);

	if (of_id)
@@ -1919,9 +1918,9 @@ fec_probe(struct platform_device *pdev) 
	clk_prepare_enable(fep->clk_enet_out);

	clk_prepare_enable(fep->clk_ptp);



	reg_phy = devm_regulator_get(&pdev->dev, "phy");

	if (!IS_ERR(reg_phy)) {

		ret = regulator_enable(reg_phy);

	fep->reg_phy = devm_regulator_get(&pdev->dev, "phy");

	if (!IS_ERR(fep->reg_phy)) {

		ret = regulator_enable(fep->reg_phy);

		if (ret) {

			dev_err(&pdev->dev,

				"Failed to enable phy regulator: %d\n", ret);