kernel: bump 4.14 to 4.14.155
[oweals/openwrt.git] / target / linux / brcm63xx / patches-4.14 / 001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch
1 From 943b0832e0cf3afe5bd40ffb1885d06106122c5d Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jonas.gorski@gmail.com>
3 Date: Sun, 16 Jul 2017 12:49:49 +0200
4 Subject: [PATCH 1/4] bcm63xx_enet: just use "enet" as the clock name
5
6 Now that we have the individual clocks available as "enet" we
7 don't need to rely on the device id for them anymore.
8
9 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
10 ---
11  drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +----
12  1 file changed, 1 insertion(+), 4 deletions(-)
13
14 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
15 +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
16 @@ -1720,7 +1720,6 @@ static int bcm_enet_probe(struct platfor
17         struct bcm63xx_enet_platform_data *pd;
18         struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx;
19         struct mii_bus *bus;
20 -       const char *clk_name;
21         int i, ret;
22  
23         if (!bcm_enet_shared_base[0])
24 @@ -1761,14 +1760,12 @@ static int bcm_enet_probe(struct platfor
25         if (priv->mac_id == 0) {
26                 priv->rx_chan = 0;
27                 priv->tx_chan = 1;
28 -               clk_name = "enet0";
29         } else {
30                 priv->rx_chan = 2;
31                 priv->tx_chan = 3;
32 -               clk_name = "enet1";
33         }
34  
35 -       priv->mac_clk = devm_clk_get(&pdev->dev, clk_name);
36 +       priv->mac_clk = devm_clk_get(&pdev->dev, "enet");
37         if (IS_ERR(priv->mac_clk)) {
38                 ret = PTR_ERR(priv->mac_clk);
39                 goto out;