001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. From cb86630379c8f3432c916d62045b5176f17f4123 Mon Sep 17 00:00:00 2001
  2. From: Jonas Gorski <[email protected]>
  3. Date: Sun, 16 Jul 2017 12:57:21 +0200
  4. Subject: [PATCH V2 6/8] MIPS: BCM63XX: move the HSSPI PLL HZ into its own
  5. clock
  6. Split up the HSSPL clock into rate and a gate clock, to more closely
  7. match the actual hardware.
  8. Reviewed-by: Florian Fainelli <[email protected]>
  9. Signed-off-by: Jonas Gorski <[email protected]>
  10. ---
  11. arch/mips/bcm63xx/clk.c | 10 ++++++++--
  12. 1 file changed, 8 insertions(+), 2 deletions(-)
  13. --- a/arch/mips/bcm63xx/clk.c
  14. +++ b/arch/mips/bcm63xx/clk.c
  15. @@ -247,6 +247,10 @@ static struct clk clk_hsspi = {
  16. .set = hsspi_set,
  17. };
  18. +/*
  19. + * HSSPI PLL
  20. + */
  21. +static struct clk clk_hsspi_pll;
  22. /*
  23. * XTM clock
  24. @@ -376,6 +380,7 @@ static struct clk_lookup bcm6328_clks[]
  25. CLKDEV_INIT(NULL, "periph", &clk_periph),
  26. CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
  27. CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
  28. + CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
  29. /* gated clocks */
  30. CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
  31. CLKDEV_INIT(NULL, "usbh", &clk_usbh),
  32. @@ -443,6 +448,7 @@ static struct clk_lookup bcm6362_clks[]
  33. CLKDEV_INIT(NULL, "periph", &clk_periph),
  34. CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
  35. CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
  36. + CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
  37. /* gated clocks */
  38. CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
  39. CLKDEV_INIT(NULL, "usbh", &clk_usbh),
  40. @@ -477,7 +483,7 @@ static int __init bcm63xx_clk_init(void)
  41. clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks));
  42. break;
  43. case BCM6328_CPU_ID:
  44. - clk_hsspi.rate = HSSPI_PLL_HZ_6328;
  45. + clk_hsspi_pll.rate = HSSPI_PLL_HZ_6328;
  46. clkdev_add_table(bcm6328_clks, ARRAY_SIZE(bcm6328_clks));
  47. break;
  48. case BCM6338_CPU_ID:
  49. @@ -493,7 +499,7 @@ static int __init bcm63xx_clk_init(void)
  50. clkdev_add_table(bcm6358_clks, ARRAY_SIZE(bcm6358_clks));
  51. break;
  52. case BCM6362_CPU_ID:
  53. - clk_hsspi.rate = HSSPI_PLL_HZ_6362;
  54. + clk_hsspi_pll.rate = HSSPI_PLL_HZ_6362;
  55. clkdev_add_table(bcm6362_clks, ARRAY_SIZE(bcm6362_clks));
  56. break;
  57. case BCM6368_CPU_ID: