001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From 943b0832e0cf3afe5bd40ffb1885d06106122c5d Mon Sep 17 00:00:00 2001
  2. From: Jonas Gorski <[email protected]>
  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. Now that we have the individual clocks available as "enet" we
  6. don't need to rely on the device id for them anymore.
  7. Signed-off-by: Jonas Gorski <[email protected]>
  8. ---
  9. drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +----
  10. 1 file changed, 1 insertion(+), 4 deletions(-)
  11. --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
  12. +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
  13. @@ -1736,7 +1736,6 @@ static int bcm_enet_probe(struct platfor
  14. struct bcm63xx_enet_platform_data *pd;
  15. struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx;
  16. struct mii_bus *bus;
  17. - const char *clk_name;
  18. int i, ret;
  19. if (!bcm_enet_shared_base[0])
  20. @@ -1777,14 +1776,12 @@ static int bcm_enet_probe(struct platfor
  21. if (priv->mac_id == 0) {
  22. priv->rx_chan = 0;
  23. priv->tx_chan = 1;
  24. - clk_name = "enet0";
  25. } else {
  26. priv->rx_chan = 2;
  27. priv->tx_chan = 3;
  28. - clk_name = "enet1";
  29. }
  30. - priv->mac_clk = devm_clk_get(&pdev->dev, clk_name);
  31. + priv->mac_clk = devm_clk_get(&pdev->dev, "enet");
  32. if (IS_ERR(priv->mac_clk)) {
  33. ret = PTR_ERR(priv->mac_clk);
  34. goto out;