mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
e7bfda2c24
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 943b0832e0cf3afe5bd40ffb1885d06106122c5d Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Date: Sun, 16 Jul 2017 12:49:49 +0200
|
|
Subject: [PATCH 1/4] 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: Jonas Gorski <jonas.gorski@gmail.com>
|
|
---
|
|
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
|
|
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
|
|
@@ -1720,7 +1720,6 @@ static int bcm_enet_probe(struct platfor
|
|
struct bcm63xx_enet_platform_data *pd;
|
|
struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx;
|
|
struct mii_bus *bus;
|
|
- const char *clk_name;
|
|
int i, ret;
|
|
|
|
if (!bcm_enet_shared_base[0])
|
|
@@ -1761,14 +1760,12 @@ static int bcm_enet_probe(struct platfor
|
|
if (priv->mac_id == 0) {
|
|
priv->rx_chan = 0;
|
|
priv->tx_chan = 1;
|
|
- clk_name = "enet0";
|
|
} else {
|
|
priv->rx_chan = 2;
|
|
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)) {
|
|
ret = PTR_ERR(priv->mac_clk);
|
|
goto out;
|