0003-clk-starfive-Replace-SOC_STARFIVE-with-ARCH_STARFIVE.patch 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253
  1. From 124f322d1c42232e439ea9a356d68caf1d0656f3 Mon Sep 17 00:00:00 2001
  2. From: Hal Feng <[email protected]>
  3. Date: Sat, 1 Apr 2023 19:19:15 +0800
  4. Subject: [PATCH 003/122] clk: starfive: Replace SOC_STARFIVE with
  5. ARCH_STARFIVE
  6. Using ARCH_FOO symbol is preferred than SOC_FOO.
  7. Set obj-y for starfive/ in Makefile, so the StarFive drivers
  8. can be compiled with COMPILE_TEST=y but ARCH_STARFIVE=n.
  9. Reviewed-by: Conor Dooley <[email protected]>
  10. Reviewed-by: Heiko Stuebner <[email protected]>
  11. Reviewed-by: Emil Renner Berthing <[email protected]>
  12. Signed-off-by: Hal Feng <[email protected]>
  13. Signed-off-by: Conor Dooley <[email protected]>
  14. ---
  15. drivers/clk/Makefile | 2 +-
  16. drivers/clk/starfive/Kconfig | 6 +++---
  17. 2 files changed, 4 insertions(+), 4 deletions(-)
  18. --- a/drivers/clk/Makefile
  19. +++ b/drivers/clk/Makefile
  20. @@ -117,7 +117,7 @@ obj-$(CONFIG_PLAT_SPEAR) += spear/
  21. obj-y += sprd/
  22. obj-$(CONFIG_ARCH_STI) += st/
  23. obj-$(CONFIG_ARCH_STM32) += stm32/
  24. -obj-$(CONFIG_SOC_STARFIVE) += starfive/
  25. +obj-y += starfive/
  26. obj-$(CONFIG_ARCH_SUNXI) += sunxi/
  27. obj-y += sunxi-ng/
  28. obj-$(CONFIG_ARCH_TEGRA) += tegra/
  29. --- a/drivers/clk/starfive/Kconfig
  30. +++ b/drivers/clk/starfive/Kconfig
  31. @@ -2,8 +2,8 @@
  32. config CLK_STARFIVE_JH7100
  33. bool "StarFive JH7100 clock support"
  34. - depends on SOC_STARFIVE || COMPILE_TEST
  35. - default SOC_STARFIVE
  36. + depends on ARCH_STARFIVE || COMPILE_TEST
  37. + default ARCH_STARFIVE
  38. help
  39. Say yes here to support the clock controller on the StarFive JH7100
  40. SoC.
  41. @@ -11,7 +11,7 @@ config CLK_STARFIVE_JH7100
  42. config CLK_STARFIVE_JH7100_AUDIO
  43. tristate "StarFive JH7100 audio clock support"
  44. depends on CLK_STARFIVE_JH7100
  45. - default m if SOC_STARFIVE
  46. + default m if ARCH_STARFIVE
  47. help
  48. Say Y or M here to support the audio clocks on the StarFive JH7100
  49. SoC.