diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2017-07-19 23:21:00 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2017-07-20 12:16:46 +0200 |
| commit | 600afbfe1c4649bace1be2c42dc62b43f480fc28 (patch) | |
| tree | 281fb88c1b42abac7e8bf2e81a4c3c31d9971a43 /drivers/net/macb.c | |
| parent | d1fc58d8874f6057cd8a3e63ca807e5ca8e29a5b (diff) | |
| download | barebox-600afbfe1c4649bace1be2c42dc62b43f480fc28.tar.gz barebox-600afbfe1c4649bace1be2c42dc62b43f480fc28.tar.xz | |
macb: fix clock probing with DT
With DT enabled the following was logged:
macb fffbc000.ethernet: no macb_clk
macb fffbc000.ethernet: probe failed: Invalid argument
The clock probed was with the name used in a non-DT setup.
Fix so we use a proper name ("pclk") with DT, and keep
current fuctionality without DT.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 739a3dfbef..7721bcb56a 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -666,7 +666,7 @@ static int macb_probe(struct device_d *dev) macb->miibus.dev.device_node = mdiobus; macb->phy_addr = -1; - pclk_name = NULL; + pclk_name = "pclk"; } else { dev_err(dev, "macb: no platform_data\n"); return -ENODEV; @@ -681,7 +681,7 @@ static int macb_probe(struct device_d *dev) * Do some basic initialization so that we at least can talk * to the PHY */ - macb->pclk = clk_get(dev, "macb_clk"); + macb->pclk = clk_get(dev, pclk_name); if (IS_ERR(macb->pclk)) { dev_err(dev, "no macb_clk\n"); return PTR_ERR(macb->pclk); |