Commit 75550015 authored by Jonas Gorski's avatar Jonas Gorski Committed by David S. Miller

bcm63xx_enet: just use "enet" as the clock name

Now that we have the individual clocks available as "enet" we
don't need to rely on the device id for them anymore.
Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e6d6043
...@@ -1716,7 +1716,6 @@ static int bcm_enet_probe(struct platform_device *pdev) ...@@ -1716,7 +1716,6 @@ static int bcm_enet_probe(struct platform_device *pdev)
struct bcm63xx_enet_platform_data *pd; struct bcm63xx_enet_platform_data *pd;
struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx; struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx;
struct mii_bus *bus; struct mii_bus *bus;
const char *clk_name;
int i, ret; int i, ret;
if (!bcm_enet_shared_base[0]) if (!bcm_enet_shared_base[0])
...@@ -1757,14 +1756,12 @@ static int bcm_enet_probe(struct platform_device *pdev) ...@@ -1757,14 +1756,12 @@ static int bcm_enet_probe(struct platform_device *pdev)
if (priv->mac_id == 0) { if (priv->mac_id == 0) {
priv->rx_chan = 0; priv->rx_chan = 0;
priv->tx_chan = 1; priv->tx_chan = 1;
clk_name = "enet0";
} else { } else {
priv->rx_chan = 2; priv->rx_chan = 2;
priv->tx_chan = 3; priv->tx_chan = 3;
clk_name = "enet1";
} }
priv->mac_clk = devm_clk_get(&pdev->dev, clk_name); priv->mac_clk = devm_clk_get(&pdev->dev, "enet");
if (IS_ERR(priv->mac_clk)) { if (IS_ERR(priv->mac_clk)) {
ret = PTR_ERR(priv->mac_clk); ret = PTR_ERR(priv->mac_clk);
goto out; goto out;
......
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