|
@@ -475,14 +475,6 @@ static void __lpc_get_mac(struct netdata_local *pldat, u8 *mac)
|
|
mac[5] = tmp >> 8;
|
|
mac[5] = tmp >> 8;
|
|
}
|
|
}
|
|
|
|
|
|
-static void __lpc_eth_clock_enable(struct netdata_local *pldat, bool enable)
|
|
|
|
-{
|
|
|
|
- if (enable)
|
|
|
|
- clk_prepare_enable(pldat->clk);
|
|
|
|
- else
|
|
|
|
- clk_disable_unprepare(pldat->clk);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static void __lpc_params_setup(struct netdata_local *pldat)
|
|
static void __lpc_params_setup(struct netdata_local *pldat)
|
|
{
|
|
{
|
|
u32 tmp;
|
|
u32 tmp;
|
|
@@ -1056,7 +1048,7 @@ static int lpc_eth_close(struct net_device *ndev)
|
|
writel(0, LPC_ENET_MAC2(pldat->net_base));
|
|
writel(0, LPC_ENET_MAC2(pldat->net_base));
|
|
spin_unlock_irqrestore(&pldat->lock, flags);
|
|
spin_unlock_irqrestore(&pldat->lock, flags);
|
|
|
|
|
|
- __lpc_eth_clock_enable(pldat, false);
|
|
|
|
|
|
+ clk_disable_unprepare(pldat->clk);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -1197,11 +1189,14 @@ static int lpc_eth_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
|
|
static int lpc_eth_open(struct net_device *ndev)
|
|
static int lpc_eth_open(struct net_device *ndev)
|
|
{
|
|
{
|
|
struct netdata_local *pldat = netdev_priv(ndev);
|
|
struct netdata_local *pldat = netdev_priv(ndev);
|
|
|
|
+ int ret;
|
|
|
|
|
|
if (netif_msg_ifup(pldat))
|
|
if (netif_msg_ifup(pldat))
|
|
dev_dbg(&pldat->pdev->dev, "enabling %s\n", ndev->name);
|
|
dev_dbg(&pldat->pdev->dev, "enabling %s\n", ndev->name);
|
|
|
|
|
|
- __lpc_eth_clock_enable(pldat, true);
|
|
|
|
|
|
+ ret = clk_prepare_enable(pldat->clk);
|
|
|
|
+ if (ret)
|
|
|
|
+ return ret;
|
|
|
|
|
|
/* Suspended PHY makes LPC ethernet core block, so resume now */
|
|
/* Suspended PHY makes LPC ethernet core block, so resume now */
|
|
phy_resume(ndev->phydev);
|
|
phy_resume(ndev->phydev);
|
|
@@ -1320,7 +1315,9 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
|
|
}
|
|
}
|
|
|
|
|
|
/* Enable network clock */
|
|
/* Enable network clock */
|
|
- __lpc_eth_clock_enable(pldat, true);
|
|
|
|
|
|
+ ret = clk_prepare_enable(pldat->clk);
|
|
|
|
+ if (ret)
|
|
|
|
+ goto err_out_clk_put;
|
|
|
|
|
|
/* Map IO space */
|
|
/* Map IO space */
|
|
pldat->net_base = ioremap(res->start, resource_size(res));
|
|
pldat->net_base = ioremap(res->start, resource_size(res));
|
|
@@ -1454,6 +1451,7 @@ err_out_iounmap:
|
|
iounmap(pldat->net_base);
|
|
iounmap(pldat->net_base);
|
|
err_out_disable_clocks:
|
|
err_out_disable_clocks:
|
|
clk_disable_unprepare(pldat->clk);
|
|
clk_disable_unprepare(pldat->clk);
|
|
|
|
+err_out_clk_put:
|
|
clk_put(pldat->clk);
|
|
clk_put(pldat->clk);
|
|
err_out_free_dev:
|
|
err_out_free_dev:
|
|
free_netdev(ndev);
|
|
free_netdev(ndev);
|