diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/freescale/fec.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index 9ce5b7185fda..b11cdbcc04ff 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h | |||
@@ -272,6 +272,7 @@ struct fec_enet_private { | |||
272 | int hwts_tx_en; | 272 | int hwts_tx_en; |
273 | struct timer_list time_keep; | 273 | struct timer_list time_keep; |
274 | struct fec_enet_delayed_work delay_work; | 274 | struct fec_enet_delayed_work delay_work; |
275 | struct regulator *reg_phy; | ||
275 | }; | 276 | }; |
276 | 277 | ||
277 | void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev); | 278 | void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev); |
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 0936b26b5e1e..57ac7c3453d6 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c | |||
@@ -1840,7 +1840,6 @@ fec_probe(struct platform_device *pdev) | |||
1840 | struct resource *r; | 1840 | struct resource *r; |
1841 | const struct of_device_id *of_id; | 1841 | const struct of_device_id *of_id; |
1842 | static int dev_id; | 1842 | static int dev_id; |
1843 | struct regulator *reg_phy; | ||
1844 | 1843 | ||
1845 | of_id = of_match_device(fec_dt_ids, &pdev->dev); | 1844 | of_id = of_match_device(fec_dt_ids, &pdev->dev); |
1846 | if (of_id) | 1845 | if (of_id) |
@@ -1919,9 +1918,9 @@ fec_probe(struct platform_device *pdev) | |||
1919 | clk_prepare_enable(fep->clk_enet_out); | 1918 | clk_prepare_enable(fep->clk_enet_out); |
1920 | clk_prepare_enable(fep->clk_ptp); | 1919 | clk_prepare_enable(fep->clk_ptp); |
1921 | 1920 | ||
1922 | reg_phy = devm_regulator_get(&pdev->dev, "phy"); | 1921 | fep->reg_phy = devm_regulator_get(&pdev->dev, "phy"); |
1923 | if (!IS_ERR(reg_phy)) { | 1922 | if (!IS_ERR(fep->reg_phy)) { |
1924 | ret = regulator_enable(reg_phy); | 1923 | ret = regulator_enable(fep->reg_phy); |
1925 | if (ret) { | 1924 | if (ret) { |
1926 | dev_err(&pdev->dev, | 1925 | dev_err(&pdev->dev, |
1927 | "Failed to enable phy regulator: %d\n", ret); | 1926 | "Failed to enable phy regulator: %d\n", ret); |