Allow COMMON_CLK to be selectable
Subsystems (15)
Stephen Boyd
maintainerv2 cover Allow COMMON_CLK to be selectable
This patch series cleans up a handful of selects that were redundant and deletes presumably dead code with the goal of making it possible to add kunit tests for the CCF in the future. To do that, we introduce a "legacy" clk Kconfig option to mark code that hasn't migrated to the common clk framework and then make the COMMON_CLK config option visible in the menuconfig as long as that legacy option isn't enabled. I've also included a couple patches at the end that may be more controversial but helped me consolidate all this logic/code.
I haven't done more than compile test a few configs for arm, arm64, h8300, and mips. More testing is welcome.
The plan is that I'll just merge the whole pile through the clk tree. If the first five patches or the last three patches are better going through another tree like arm-soc or architecture trees that's fine too, but there are potential conflicts between trees so maybe it's better to just leave it all in one tree.
Changes from v1:
* Fixed MIPS ralink build problem pointed out by Arnd
* Fixed meson mx sdio build due to bad Kconfig exposed by this change
* Picked up acks
Stephen Boyd (10):
ARM: Remove redundant COMMON_CLK selects
ARM: Remove redundant CLKDEV_LOOKUP selects
arm64: tegra: Remove redundant CLKDEV_LOOKUP selects
h8300: Remove redundant CLKDEV_LOOKUP selects
MIPS: Remove redundant CLKDEV_LOOKUP selects
mmc: meson-mx-sdio: Depend on OF_ADDRESS and not just OF
clk: Allow the common clk framework to be selectable
ARM: mmp: Remove legacy clk code
MIPS: Loongson64: Drop asm/clock.h include
clk: Move HAVE_CLK config out of architecture layer
arch/Kconfig | 6 -- arch/arm/Kconfig | 5 +- arch/arm/mach-actions/Kconfig | 1 - arch/arm/mach-clps711x/Kconfig | 1 - arch/arm/mach-mmp/Kconfig | 1 - arch/arm/mach-mmp/Makefile | 6 -- arch/arm/mach-mmp/clock-mmp2.c | 114 ------------------------------- arch/arm/mach-mmp/clock-pxa168.c | 94 ------------------------- arch/arm/mach-mmp/clock-pxa910.c | 70 ------------------- arch/arm/mach-mmp/clock.c | 105 ---------------------------- arch/arm/mach-mmp/clock.h | 65 ------------------ arch/arm/mach-vt8500/Kconfig | 1 - arch/arm64/Kconfig.platforms | 1 - arch/c6x/Kconfig | 1 + arch/h8300/Kconfig | 1 - arch/m68k/Kconfig.cpu | 2 +- arch/mips/Kconfig | 7 +- arch/mips/loongson2ef/Kconfig | 2 +- arch/mips/loongson64/smp.c | 1 - arch/mips/ralink/Kconfig | 4 ++ arch/sh/boards/Kconfig | 5 ++ arch/unicore32/Kconfig | 2 +- drivers/clk/Kconfig | 23 +++++-- drivers/mmc/host/Kconfig | 2 +- 24 files changed, 38 insertions(+), 482 deletions(-) delete mode 100644 arch/arm/mach-mmp/clock-mmp2.c delete mode 100644 arch/arm/mach-mmp/clock-pxa168.c delete mode 100644 arch/arm/mach-mmp/clock-pxa910.c delete mode 100644 arch/arm/mach-mmp/clock.c delete mode 100644 arch/arm/mach-mmp/clock.h
base-commit: 7111951b8d4973bda27ff663f2cf18b663d15b48
Signature · 1 line
Sent by a computer, using git, on the internet
Stephen Boyd
maintainerPATCH v2 1/10 ARM: Remove redundant COMMON_CLK selects
The mulitplatform config already selects COMMON_CLK, so selecting it again is not useful. Remove these selects from ARM platforms that are part of the multiplatform build.
--- arch/arm/mach-actions/Kconfig | 1 - arch/arm/mach-clps711x/Kconfig | 1 - arch/arm/mach-mmp/Kconfig | 1 - 3 files changed, 3 deletions(-)
arch/arm/mach-actions/Kconfig +0 -1
@@ -7,7 +7,6 @@ menuconfig ARCH_ACTIONS select ARM_GLOBAL_TIMER select CACHE_L2X0 select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK - select COMMON_CLK select GENERIC_IRQ_CHIP select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP
arch/arm/mach-clps711x/Kconfig +0 -1
@@ -5,7 +5,6 @@ menuconfig ARCH_CLPS711X select AUTO_ZRELADDR select TIMER_OF select CLPS711X_TIMER - select COMMON_CLK select CPU_ARM720T select GENERIC_CLOCKEVENTS select GPIOLIB
arch/arm/mach-mmp/Kconfig +0 -1
@@ -110,7 +110,6 @@ config MACH_MMP_DT depends on ARCH_MULTI_V5 select PINCTRL select PINCTRL_SINGLE - select COMMON_CLK select ARCH_HAS_RESET_CONTROLLER select CPU_MOHAWK help
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 01/10] ARM: Remove redundant COMMON_CLK selects
Quoting Stephen Boyd (2020-04-08 23:44:07)
Quoted 12 lines
The mulitplatform config already selects
COMMON_CLK, so selecting it again is not useful. Remove these selects from ARM platforms that are part of the multiplatform build.Reviewed-by "Andreas Färber" <[email protected]> # actionsCc Russell King <[email protected]>Cc Alexander Shiyan <[email protected]>Cc Lubomir Rintel <[email protected]>Cc <[email protected]>Cc Arnd Bergmann <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 1 line
---
Applied to clk-next
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Stephen Boyd
maintainerPATCH v2 2/10 ARM: Remove redundant CLKDEV_LOOKUP selects
In reply to Stephen BoydThese platforms select COMMON_CLK indirectly through use of the ARCH_MULTIPLATFORM config option that they depend on implicitly via some V7/V6/V5 multi platform config option. The COMMON_CLK config option already selects CLKDEV_LOOKUP so it's redundant to have this selected again.
--- arch/arm/Kconfig | 3 --- arch/arm/mach-vt8500/Kconfig | 1 - 2 files changed, 4 deletions(-)
arch/arm/Kconfig +0 -3
@@ -435,7 +435,6 @@ config ARCH_PXA select ARM_CPU_SUSPEND if PM select AUTO_ZRELADDR select COMMON_CLK - select CLKDEV_LOOKUP select CLKSRC_PXA select CLKSRC_MMIO select TIMER_OF
@@ -474,7 +473,6 @@ config ARCH_SA1100 bool "SA1100-based" select ARCH_MTD_XIP select ARCH_SPARSEMEM_ENABLE - select CLKDEV_LOOKUP select CLKSRC_MMIO select CLKSRC_PXA select TIMER_OF if OF
@@ -495,7 +493,6 @@ config ARCH_SA1100 config ARCH_S3C24XX bool "Samsung S3C24XX SoCs" select ATAGS - select CLKDEV_LOOKUP select CLKSRC_SAMSUNG_PWM select GENERIC_CLOCKEVENTS select GPIO_SAMSUNG
arch/arm/mach-vt8500/Kconfig +0 -1
@@ -2,7 +2,6 @@ config ARCH_VT8500 bool select GPIOLIB - select CLKDEV_LOOKUP select VT8500_TIMER select PINCTRL help
Signature · 7 lines
Sent by a computer, using git, on the internet _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 02/10] ARM: Remove redundant CLKDEV_LOOKUP selects
Quoting Stephen Boyd (2020-04-08 23:44:08)
Quoted 6 lines
These platforms select
COMMON_CLKindirectly through use of theARCH_MULTIPLATFORMconfig option that they depend on implicitly via some V7/V6/V5 multi platform config option. TheCOMMON_CLKconfig option already selectsCLKDEV_LOOKUPso it's redundant to have this selected again.
Quoted 6 lines
Cc Tony Prisk <[email protected]>Cc Russell King <[email protected]>Cc <[email protected]>Cc Arnd Bergmann <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Stephen Boyd
maintainerPATCH v2 3/10 arm64: tegra: Remove redundant CLKDEV_LOOKUP selects
In reply to Stephen BoydThe arm64 architecture selects COMMON_CLK at the toplevel ARM64 config. The COMMON_CLK config option already selects CLKDEV_LOOKUP so it's redundant to have this selected again for the Tegra specific config.
--- arch/arm64/Kconfig.platforms | 1 - 1 file changed, 1 deletion(-)
arch/arm64/Kconfig.platforms +0 -1
@@ -236,7 +236,6 @@ config ARCH_TEGRA bool "NVIDIA Tegra SoC Family" select ARCH_HAS_RESET_CONTROLLER select ARM_GIC_PM - select CLKDEV_LOOKUP select CLKSRC_MMIO select TIMER_OF select GENERIC_CLOCKEVENTS
Signature · 7 lines
Sent by a computer, using git, on the internet _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 03/10] arm64: tegra: Remove redundant CLKDEV_LOOKUP selects
Quoting Stephen Boyd (2020-04-08 23:44:09)
Quoted 4 lines
The arm64 architecture selects
COMMON_CLKat the toplevel ARM64 config. TheCOMMON_CLKconfig option already selectsCLKDEV_LOOKUPso it's redundant to have this selected again for the Tegra specific config.
Quoted 8 lines
Cc Paul Walmsley <[email protected]>Acked-by Thierry Reding <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Cc <[email protected]>Cc Arnd Bergmann <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Stephen Boyd
maintainerPATCH v2 4/10 h8300: Remove redundant CLKDEV_LOOKUP selects
In reply to Stephen BoydThe h8300 architecture selects COMMON_CLK already, and the COMMON_CLK config option already selects CLKDEV_LOOKUP so it's redundant to have this selected again.
--- arch/h8300/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/h8300/Kconfig +0 -1
@@ -13,7 +13,6 @@ config H8300 select GENERIC_CPU_DEVICES select MODULES_USE_ELF_RELA select GENERIC_CLOCKEVENTS - select CLKDEV_LOOKUP select COMMON_CLK select ARCH_WANT_FRAME_POINTERS select OF
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 04/10] h8300: Remove redundant CLKDEV_LOOKUP selects
Quoting Stephen Boyd (2020-04-08 23:44:10)
Quoted 9 lines
The h8300 architecture selects
COMMON_CLKalready, and theCOMMON_CLKconfig option already selectsCLKDEV_LOOKUPso it's redundant to have this selected again.Cc Yoshinori Sato <[email protected]>Cc Arnd Bergmann <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Stephen Boyd
maintainerPATCH v2 5/10 MIPS: Remove redundant CLKDEV_LOOKUP selects
In reply to Stephen BoydThe ATH79 config selects COMMON_CLK already, and the COMMON_CLK config option already selects CLKDEV_LOOKUP, and CLKDEV_LOOKUP already selects HAVE_CLK so it's redundant to have these selected again.
--- arch/mips/Kconfig | 2 -- 1 file changed, 2 deletions(-)
arch/mips/Kconfig +0 -2
@@ -209,9 +209,7 @@ config ATH79 select DMA_NONCOHERENT select GPIOLIB select PINCTRL - select HAVE_CLK select COMMON_CLK - select CLKDEV_LOOKUP select IRQ_MIPS_CPU select SYS_HAS_CPU_MIPS32_R2 select SYS_HAS_EARLY_PRINTK
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 05/10] MIPS: Remove redundant CLKDEV_LOOKUP selects
Quoting Stephen Boyd (2020-04-08 23:44:11)
Quoted 8 lines
The ATH79 config selects
COMMON_CLKalready, and theCOMMON_CLKconfig option already selectsCLKDEV_LOOKUP, andCLKDEV_LOOKUPalready selectsHAVE_CLKso it's redundant to have these selected again.Cc Thomas Bogendoerfer <[email protected]>Cc <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Stephen Boyd
maintainerPATCH v2 6/10 mmc: meson-mx-sdio: Depend on OF_ADDRESS and not just OF
In reply to Stephen BoydMaking COMMON_CLK a visible option causes the sparc allyesconfig to fail to build like so:
sparc64-linux-ld: drivers/mmc/host/meson-mx-sdio.o: in function `meson_mx_mmc_remove':
meson-mx-sdio.c:(.text+0x70): undefined reference to `of_platform_device_destroy'
sparc64-linux-ld: drivers/mmc/host/meson-mx-sdio.o: in function `meson_mx_mmc_probe':
meson-mx-sdio.c:(.text+0x9e4): undefined reference to `of_platform_device_create'
sparc64-linux-ld: meson-mx-sdio.c:(.text+0xdd4): undefined reference to `of_platform_device_destroy'
This is because the implementation of of_platform_device_destroy() is inside an #ifdef CONFIG_OF_ADDRESS section of drivers/of/platform.c. This driver already depends on OF being enabled, so let's tighten that constrain a little more so that it depends on OF_ADDRESS instead. This way we won't try to build this driver on platforms that don't have this function.
--- drivers/mmc/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/Kconfig +1 -1
@@ -409,7 +409,7 @@ config MMC_MESON_MX_SDIO tristate "Amlogic Meson6/Meson8/Meson8b SD/MMC Host Controller support" depends on ARCH_MESON || COMPILE_TEST depends on COMMON_CLK - depends on OF + depends on OF_ADDRESS help This selects support for the SD/MMC Host Controller on Amlogic Meson6, Meson8 and Meson8b SoCs.
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 06/10] mmc: meson-mx-sdio: Depend on OF_ADDRESS and not just OF
Quoted 17 lines · Stephen Boyd
Making
COMMON_CLKa visible option causes the sparc allyesconfig to fail to build like so:sparc64-linux-ld: drivers/mmc/host/meson-mx-sdio.o: in function `meson_mx_mmc_remove': meson-mx-sdio.c:(.text+0x70): undefined reference to `of_platform_device_destroy' sparc64-linux-ld: drivers/mmc/host/meson-mx-sdio.o: in function `meson_mx_mmc_probe': meson-mx-sdio.c:(.text+0x9e4): undefined reference to `of_platform_device_create' sparc64-linux-ld: meson-mx-sdio.c:(.text+0xdd4): undefined reference to `of_platform_device_destroy'This is because the implementation of
of_platform_device_destroy()is inside an #ifdefCONFIG_OF_ADDRESSsection ofdrivers/of/platform.c. This driver already depends on OF being enabled, so let's tighten that constrain a little more so that it depends onOF_ADDRESSinstead. This way we won't try to build this driver on platforms that don't have this function.
Quoted 4 lines
Reported-by kbuild test robot <[email protected]>Cc Neil Armstrong <[email protected]>Cc Ulf Hansson <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
I don't have the complete picture here, can I just apply this a fix to my mmc tree?
Kind regards
Uffe
Quoted 20 lines
--- drivers/mmc/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/mmc/host/Kconfig +1
-2@@ -409,7 +409,7 @@ config MMC_MESON_MX_SDIO tristate "Amlogic Meson6/Meson8/Meson8b SD/MMC Host Controller support" depends on ARCH_MESON || COMPILE_TEST depends on COMMON_CLK - depends on OF + depends on OF_ADDRESS help This selects support for the SD/MMC Host Controller on Amlogic Meson6, Meson8 and Meson8b SoCs. --Sent by a computer, using git, on the internet
Stephen Boyd
maintainerRe: [PATCH v2 06/10] mmc: meson-mx-sdio: Depend on OF_ADDRESS and not just OF
Quoting Ulf Hansson (2020-04-21 07:04:54)
Quoted 18 lines · Stephen Boyd
Quoted 17 lines
Making
COMMON_CLKa visible option causes the sparc allyesconfig to fail to build like so:sparc64-linux-ld: drivers/mmc/host/meson-mx-sdio.o: in function `meson_mx_mmc_remove': meson-mx-sdio.c:(.text+0x70): undefined reference to `of_platform_device_destroy' sparc64-linux-ld: drivers/mmc/host/meson-mx-sdio.o: in function `meson_mx_mmc_probe': meson-mx-sdio.c:(.text+0x9e4): undefined reference to `of_platform_device_create' sparc64-linux-ld: meson-mx-sdio.c:(.text+0xdd4): undefined reference to `of_platform_device_destroy'This is because the implementation of
of_platform_device_destroy()is inside an #ifdefCONFIG_OF_ADDRESSsection ofdrivers/of/platform.c. This driver already depends on OF being enabled, so let's tighten that constrain a little more so that it depends onOF_ADDRESSinstead. This way we won't try to build this driver on platforms that don't have this function.
Quoted 8 lines
Quoted 4 lines
Reported-by kbuild test robot <[email protected]>Cc Neil Armstrong <[email protected]>Cc Ulf Hansson <[email protected]>Signed-off-by Stephen Boyd <[email protected]>I don't have the complete picture here, can I just apply this a fix to my mmc tree?
If this patch stays in the series then I can avoid a bisection hole. And it also doesn't matter until COMMON_CLK config becomes selectable. Maybe just ack and let it go through clk tree? Unless there's something changing here in the mmc tree?
Ulf Hansson
Acked-byRe: [PATCH v2 06/10] mmc: meson-mx-sdio: Depend on OF_ADDRESS and not just OF
Quoted 25 lines · Stephen Boyd
Quoting Ulf Hansson (2020-04-21 07:04:54)
Quoted 23 lines · Stephen Boyd
Quoted 21 lines
Making
COMMON_CLKa visible option causes the sparc allyesconfig to fail to build like so:sparc64-linux-ld: drivers/mmc/host/meson-mx-sdio.o: in function `meson_mx_mmc_remove': meson-mx-sdio.c:(.text+0x70): undefined reference to `of_platform_device_destroy' sparc64-linux-ld: drivers/mmc/host/meson-mx-sdio.o: in function `meson_mx_mmc_probe': meson-mx-sdio.c:(.text+0x9e4): undefined reference to `of_platform_device_create' sparc64-linux-ld: meson-mx-sdio.c:(.text+0xdd4): undefined reference to `of_platform_device_destroy'This is because the implementation of
of_platform_device_destroy()is inside an #ifdefCONFIG_OF_ADDRESSsection ofdrivers/of/platform.c. This driver already depends on OF being enabled, so let's tighten that constrain a little more so that it depends onOF_ADDRESSinstead. This way we won't try to build this driver on platforms that don't have this function.Reported-by kbuild test robot <[email protected]>Cc Neil Armstrong <[email protected]>Cc Ulf Hansson <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 8 lines
Quoted 3 lines
I don't have the complete picture here, can I just apply this a fix to my mmc tree?
If this patch stays in the series then I can avoid a bisection hole. And it also doesn't matter until
COMMON_CLKconfig becomes selectable. Maybe just ack and let it go through clk tree? Unless there's something changing here in the mmc tree?
This file is likely to change in my mmc-tree. However, let's deal with the conflict, if/when that happens. So, please pick it through your clock tree.
Kind regards
Uffe
Re: [PATCH v2 06/10] mmc: meson-mx-sdio: Depend on OF_ADDRESS and not just OF
In reply to Stephen BoydQuoting Stephen Boyd (2020-04-08 23:44:12)
Quoted 16 lines
Making
COMMON_CLKa visible option causes the sparc allyesconfig to fail to build like so:sparc64-linux-ld: drivers/mmc/host/meson-mx-sdio.o: in function `meson_mx_mmc_remove': meson-mx-sdio.c:(.text+0x70): undefined reference to `of_platform_device_destroy' sparc64-linux-ld: drivers/mmc/host/meson-mx-sdio.o: in function `meson_mx_mmc_probe': meson-mx-sdio.c:(.text+0x9e4): undefined reference to `of_platform_device_create' sparc64-linux-ld: meson-mx-sdio.c:(.text+0xdd4): undefined reference to `of_platform_device_destroy'This is because the implementation of
of_platform_device_destroy()is inside an #ifdefCONFIG_OF_ADDRESSsection ofdrivers/of/platform.c. This driver already depends on OF being enabled, so let's tighten that constrain a little more so that it depends onOF_ADDRESSinstead. This way we won't try to build this driver on platforms that don't have this function.
Quoted 5 lines
Reported-by kbuild test robot <[email protected]>Cc Neil Armstrong <[email protected]>Cc Ulf Hansson <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Stephen Boyd
maintainerPATCH v2 7/10 clk: Allow the common clk framework to be selectable
In reply to Stephen BoydEnable build testing and configuration control of the common clk framework so that more code coverage and testing can be done on the common clk framework across various architectures. This also nicely removes the requirement that architectures must select the framework when they don't use it in architecture code.
There's one snag with doing this, and that's making sure that randconfig builds don't select this option when some architecture or platform implements 'struct clk' outside of the common clk framework. Introduce a new config option 'HAVE_LEGACY_CLK' to indicate those platforms that haven't migrated to the common clk framework and therefore shouldn't be allowed to select this new config option. Also add a note that we hope one day to remove this config entirely.
Based on a patch by Mark Brown <[email protected]>.
--- arch/arm/Kconfig | 2 ++ arch/c6x/Kconfig | 1 + arch/m68k/Kconfig.cpu | 2 +- arch/mips/Kconfig | 5 +++-- arch/mips/loongson2ef/Kconfig | 2 +- arch/mips/ralink/Kconfig | 4 ++++ arch/sh/boards/Kconfig | 5 +++++ arch/unicore32/Kconfig | 2 +- drivers/clk/Kconfig | 17 +++++++++++++---- 9 files changed, 31 insertions(+), 9 deletions(-)
arch/arm/Kconfig +2 -0
@@ -364,6 +364,7 @@ config ARCH_EP93XX select CPU_ARM920T select GENERIC_CLOCKEVENTS select GPIOLIB + select HAVE_LEGACY_CLK help This enables support for the Cirrus EP93xx series of CPUs.
@@ -522,6 +523,7 @@ config ARCH_OMAP1 select GENERIC_IRQ_MULTI_HANDLER select GPIOLIB select HAVE_IDE + select HAVE_LEGACY_CLK select IRQ_DOMAIN select NEED_MACH_IO_H if PCCARD select NEED_MACH_MEMORY_H
arch/c6x/Kconfig +1 -0
@@ -11,6 +11,7 @@ config C6X select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE select CLKDEV_LOOKUP + select HAVE_LEGACY_CLK select GENERIC_ATOMIC64 select GENERIC_IRQ_SHOW select HAVE_ARCH_TRACEHOOK
arch/m68k/Kconfig.cpu +1 -1
@@ -28,7 +28,7 @@ config COLDFIRE select CPU_HAS_NO_MULDIV64 select GENERIC_CSUM select GPIOLIB - select HAVE_CLK + select HAVE_LEGACY_CLK endchoice
arch/mips/Kconfig +3 -2
@@ -181,7 +181,7 @@ config AR7 select SYS_SUPPORTS_ZBOOT_UART16550 select GPIOLIB select VLYNQ - select HAVE_CLK + select HAVE_LEGACY_CLK help Support for the Texas Instruments AR7 System-on-a-Chip family: TNETD7100, 7200 and 7300.
@@ -296,9 +296,9 @@ config BCM63XX select SYS_HAS_EARLY_PRINTK select SWAP_IO_SPACE select GPIOLIB - select HAVE_CLK select MIPS_L1_CACHE_SHIFT_4 select CLKDEV_LOOKUP + select HAVE_LEGACY_CLK help Support for BCM63XX based boards
@@ -419,6 +419,7 @@ config LANTIQ select SWAP_IO_SPACE select BOOT_RAW select CLKDEV_LOOKUP + select HAVE_LEGACY_CLK select USE_OF select PINCTRL select PINCTRL_LANTIQ
arch/mips/loongson2ef/Kconfig +1 -1
@@ -46,7 +46,7 @@ config LEMOTE_MACH2F select CSRC_R4K if ! MIPS_EXTERNAL_TIMER select DMA_NONCOHERENT select GENERIC_ISA_DMA_SUPPORT_BROKEN - select HAVE_CLK + select HAVE_LEGACY_CLK select FORCE_PCI select I8259 select IRQ_MIPS_CPU
arch/mips/ralink/Kconfig +4 -0
@@ -27,18 +27,22 @@ choice config SOC_RT288X bool "RT288x" select MIPS_L1_CACHE_SHIFT_4 + select HAVE_LEGACY_CLK select HAVE_PCI config SOC_RT305X bool "RT305x" + select HAVE_LEGACY_CLK config SOC_RT3883 bool "RT3883" + select HAVE_LEGACY_CLK select HAVE_PCI config SOC_MT7620 bool "MT7620/8" select CPU_MIPSR2_IRQ_VI + select HAVE_LEGACY_CLK select HAVE_PCI config SOC_MT7621
arch/sh/boards/Kconfig +5 -0
@@ -7,6 +7,11 @@ config SOLUTION_ENGINE config SH_ALPHA_BOARD bool +config SH_CUSTOM_CLK + def_bool y + depends on !SH_DEVICE_TREE + select HAVE_LEGACY_CLK + config SH_DEVICE_TREE bool select OF
arch/unicore32/Kconfig +1 -1
@@ -70,7 +70,7 @@ config ARCH_PUV3 def_bool y select CPU_UCV2 select GENERIC_CLOCKEVENTS - select HAVE_CLK + select HAVE_LEGACY_CLK select GPIOLIB # CONFIGs for ARCH_PUV3
drivers/clk/Kconfig +13 -4
@@ -7,8 +7,18 @@ config CLKDEV_LOOKUP config HAVE_CLK_PREPARE bool -config COMMON_CLK +config HAVE_LEGACY_CLK # TODO: Remove once all legacy users are migrated bool + select HAVE_CLK + help + Select this option when the clock API in <linux/clk.h> is implemented + by platform/architecture code. This method is deprecated. Modern + code should select COMMON_CLK instead and not define a custom + 'struct clk'. + +menuconfig COMMON_CLK + bool "Common Clock Framework" + depends on !HAVE_LEGACY_CLK select HAVE_CLK_PREPARE select CLKDEV_LOOKUP select SRCU
@@ -20,8 +30,7 @@ config COMMON_CLK Architectures utilizing the common struct clk should select this option. -menu "Common Clock Framework" - depends on COMMON_CLK +if COMMON_CLK config COMMON_CLK_WM831X tristate "Clock driver for WM831x/2x PMICs"
@@ -362,4 +371,4 @@ source "drivers/clk/ti/Kconfig" source "drivers/clk/uniphier/Kconfig" source "drivers/clk/zynqmp/Kconfig" -endmenu +endif
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 07/10] clk: Allow the common clk framework to be selectable
Quoted 5 lines · Stephen Boyd
Enable build testing and configuration control of the common clk framework so that more code coverage and testing can be done on the common clk framework across various architectures. This also nicely removes the requirement that architectures must select the framework when they don't use it in architecture code.
Re: [PATCH v2 07/10] clk: Allow the common clk framework to be selectable
In reply to Stephen BoydQuoting Stephen Boyd (2020-04-08 23:44:13)
Quoted 34 lines
Enable build testing and configuration control of the common clk framework so that more code coverage and testing can be done on the common clk framework across various architectures. This also nicely removes the requirement that architectures must select the framework when they don't use it in architecture code.
There's one snag with doing this, and that's making sure that randconfig builds don't select this option when some architecture or platform implements 'struct clk' outside of the common clk framework. Introduce a new config option '
HAVE_LEGACY_CLK' to indicate those platforms that haven't migrated to the common clk framework and therefore shouldn't be allowed to select this new config option. Also add a note that we hope one day to remove this config entirely.Based on a patch by Mark Brown <[email protected]>.
Cc Mark Brown <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Mark Salter <[email protected]>Cc Aurelien Jacquiot <[email protected]>Cc Jiaxun Yang <[email protected]>Cc Guan Xuetao <[email protected]>Cc Russell King <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Yoshinori Sato <[email protected]>Cc Rich Felker <[email protected]>Cc Thomas Bogendoerfer <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 1 line
---
Applied to clk-next
Stephen Boyd
maintainerPATCH v2 8/10 ARM: mmp: Remove legacy clk code
In reply to Stephen BoydRemove all the legacy clk code that supports a non-common clk framework implementation of 'struct clk' in mach-mmp. This code doesn't look to be compiled anymore given that the MMP is fully supported in the multi-platform config via ARCH_MULTIPLATFORM as of commit 377524dc4d77 ("ARM: mmp: move into ARCH_MULTIPLATFORM"). The ARCH_MULTIPLATFORM config selects COMMON_CLK and therefore the Makefile rule can never actually compile the code in these files.
--- arch/arm/mach-mmp/Makefile | 6 -- arch/arm/mach-mmp/clock-mmp2.c | 114 ------------------------------- arch/arm/mach-mmp/clock-pxa168.c | 94 ------------------------- arch/arm/mach-mmp/clock-pxa910.c | 70 ------------------- arch/arm/mach-mmp/clock.c | 105 ---------------------------- arch/arm/mach-mmp/clock.h | 65 ------------------ 6 files changed, 454 deletions(-) delete mode 100644 arch/arm/mach-mmp/clock-mmp2.c delete mode 100644 arch/arm/mach-mmp/clock-pxa168.c delete mode 100644 arch/arm/mach-mmp/clock-pxa910.c delete mode 100644 arch/arm/mach-mmp/clock.c delete mode 100644 arch/arm/mach-mmp/clock.h
arch/arm/mach-mmp/Makefile +0 -6
@@ -12,12 +12,6 @@ obj-$(CONFIG_CPU_PXA910) += pxa910.o obj-$(CONFIG_CPU_MMP2) += mmp2.o obj-$(CONFIG_MMP_SRAM) += sram.o -ifeq ($(CONFIG_COMMON_CLK), ) -obj-y += clock.o -obj-$(CONFIG_CPU_PXA168) += clock-pxa168.o -obj-$(CONFIG_CPU_PXA910) += clock-pxa910.o -obj-$(CONFIG_CPU_MMP2) += clock-mmp2.o -endif ifeq ($(CONFIG_PM),y) obj-$(CONFIG_CPU_PXA910) += pm-pxa910.o obj-$(CONFIG_CPU_MMP2) += pm-mmp2.o
arch/arm/mach-mmp/clock-mmp2.c deleted +0 -114
114 lines not on this page · raw message
arch/arm/mach-mmp/clock-pxa168.c deleted +0 -94
94 lines not on this page · raw message
arch/arm/mach-mmp/clock-pxa910.c deleted +0 -70
70 lines not on this page · raw message
arch/arm/mach-mmp/clock.c deleted +0 -105
105 lines not on this page · raw message
arch/arm/mach-mmp/clock.h deleted +0 -65
65 lines not on this page · raw message
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 08/10] ARM: mmp: Remove legacy clk code
Quoting Stephen Boyd (2020-04-08 23:44:14)
Quoted 8 lines
Remove all the legacy clk code that supports a non-common clk framework implementation of 'struct clk' in mach-mmp. This code doesn't look to be compiled anymore given that the MMP is fully supported in the multi-platform config via
ARCH_MULTIPLATFORMas of commit377524dc4d77("ARM: mmp: move intoARCH_MULTIPLATFORM"). TheARCH_MULTIPLATFORMconfig selectsCOMMON_CLKand therefore theMakefilerule can never actually compile the code in these files.
Quoted 6 lines
Cc Lubomir Rintel <[email protected]>Cc Russell King <[email protected]>Cc <[email protected]>Cc Arnd Bergmann <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next + a fix for problem reported in -next
Stephen Boyd
maintainerPATCH v2 9/10 MIPS: Loongson64: Drop asm/clock.h include
In reply to Stephen BoydThis include isn't used by this file, so just remove it.
--- arch/mips/loongson64/smp.c | 1 - 1 file changed, 1 deletion(-)
arch/mips/loongson64/smp.c +0 -1
@@ -14,7 +14,6 @@#include <linux/kexec.h> #include <asm/processor.h> #include <asm/time.h> -#include <asm/clock.h> #include <asm/tlbflush.h> #include <asm/cacheflush.h> #include <loongson.h>
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 09/10] MIPS: Loongson64: Drop asm/clock.h include
Quoting Stephen Boyd (2020-04-08 23:44:15)
Quoted 8 lines
This include isn't used by this file, so just remove it.
Acked-by Jiaxun Yang <[email protected]>Cc Paul Burton <[email protected]>Cc <[email protected]>Cc <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Stephen Boyd
maintainerPATCH v2 10/10 clk: Move HAVE_CLK config out of architecture layer
In reply to Stephen BoydThe implementation of 'struct clk' is not really an architectual detail anymore now that most architectures have migrated to the common clk framework. To sway new architecture ports away from trying to implement their own 'struct clk', move the config next to the common clk framework config.
--- arch/Kconfig | 6 ------ drivers/clk/Kconfig | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)
arch/Kconfig +0 -6
@@ -321,12 +321,6 @@ config HAVE_FUNCTION_ARG_ACCESS_API the API needed to access function arguments from pt_regs, declared in asm/ptrace.h -config HAVE_CLK - bool - help - The <linux/clk.h> calls support software clock gating and - thus are a key power management tool on many systems. - config HAVE_HW_BREAKPOINT bool depends on PERF_EVENTS
drivers/clk/Kconfig +6 -0
@@ -1,5 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 +config HAVE_CLK + bool + help + The <linux/clk.h> calls support software clock gating and + thus are a key power management tool on many systems. + config CLKDEV_LOOKUP bool select HAVE_CLK
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 10/10] clk: Move HAVE_CLK config out of architecture layer
Quoting Stephen Boyd (2020-04-08 23:44:16)
Quoted 10 lines
The implementation of 'struct clk' is not really an architectual detail anymore now that most architectures have migrated to the common clk framework. To sway new architecture ports away from trying to implement their own 'struct clk', move the config next to the common clk framework config.
Cc Russell King <[email protected]>Cc Arnd Bergmann <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Quoted 19 lines · Stephen Boyd
This patch series cleans up a handful of selects that were redundant and deletes presumably dead code with the goal of making it possible to add kunit tests for the CCF in the future. To do that, we introduce a "legacy" clk
Kconfigoption to mark code that hasn't migrated to the common clk framework and then make theCOMMON_CLKconfig option visible in the menuconfig as long as that legacy option isn't enabled. I've also included a couple patches at the end that may be more controversial but helped me consolidate all this logic/code.I haven't done more than compile test a few configs for arm, arm64, h8300, and mips. More testing is welcome.
The plan is that I'll just merge the whole pile through the clk tree. If the first five patches or the last three patches are better going through another tree like arm-soc or architecture trees that's fine too, but there are potential conflicts between trees so maybe it's better to just leave it all in one tree.
Quoted 4 lines
Changes from v1:
* Fixed MIPS ralink build problem pointed out by Arnd
* Fixed meson mx sdio build due to badKconfigexposed by this change
* Picked up acks
Whole series
I also made a patch to completely remove the private clk implementation for mips/loongson2f, but it obviously clashes with your series at the moment.
I'll send you what I have today and you can decide if you want to add it to your series after it gets an Ack from the maintainers, or I'll send it separately later.
Arnd
PATCH 1/1 mips: loongsoon2ef: remove private clk api
In reply to Stephen BoydAs platforms are moving to COMMON_CLK in general, loongson2ef stuck out as something that has a private implementation but does not actually use it except for setting the frequency of the CPU itself from the loongson2_cpufreq driver.
Change that driver to call the register setting function directly and remove the rest of the stub implementation.
--- arch/mips/include/asm/clock.h | 49 ---------- .../include/asm/mach-loongson2ef/loongson.h | 1 + arch/mips/loongson2ef/Kconfig | 1 - arch/mips/loongson2ef/lemote-2f/clock.c | 98 +------------------ arch/mips/loongson64/smp.c | 1 - drivers/cpufreq/loongson2_cpufreq.c | 22 +---- 6 files changed, 8 insertions(+), 164 deletions(-) delete mode 100644 arch/mips/include/asm/clock.h
arch/mips/include/asm/clock.h deleted +0 -49
@@ -1,49 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_MIPS_CLOCK_H -#define __ASM_MIPS_CLOCK_H - -#include <linux/kref.h> -#include <linux/list.h> -#include <linux/seq_file.h> -#include <linux/clk.h> - -struct clk ; - -struct clk_ops { -void (*init) (struct clk *clk); -void (*enable) (struct clk *clk); -void (*disable) (struct clk *clk); -void (*recalc) (struct clk *clk); -int (*set_rate) (struct clk *clk,unsigned long rate,int algo_id); -long (*round_rate) (struct clk *clk,unsigned long rate); -}; - -struct clk { -struct list_head node; -const char *name; -int id; -struct module *owner; - -struct clk *parent; -struct clk_ops *ops; - -struct kref kref; - -unsigned long rate; -unsigned long flags; -}; - -#define CLK_ALWAYS_ENABLED (1 << 0) -#define CLK_RATE_PROPAGATES (1 << 1) - -int clk_init (void ); - -int __clk_enable (struct clk *); -void __clk_disable (struct clk *); - -void clk_recalc_rate (struct clk *); - -int clk_register (struct clk *); -void clk_unregister (struct clk *); - -#endif /* __ASM_MIPS_CLOCK_H */
arch/mips/include/asm/mach-loongson2ef/loongson.h +1 -0
@@ -244,6 +244,7 @@ static inline void do_perfcnt_IRQ(void)#ifdef CONFIG_CPU_SUPPORTS_CPUFREQ #include <linux/cpufreq.h> extern struct cpufreq_frequency_table loongson2_clockmod_table[]; +extern int loongson2_cpu_set_rate (unsigned long rate_khz);#endif /*
arch/mips/loongson2ef/Kconfig +0 -1
@@ -46,7 +46,6 @@ config LEMOTE_MACH2F select CSRC_R4K if ! MIPS_EXTERNAL_TIMER select DMA_NONCOHERENT select GENERIC_ISA_DMA_SUPPORT_BROKEN - select HAVE_CLK select FORCE_PCI select I8259 select IRQ_MIPS_CPU
arch/mips/loongson2ef/lemote-2f/clock.c +3 -95
128 lines not on this page · raw message
arch/mips/loongson64/smp.c +0 -1
@@ -15,7 +15,6 @@#include <linux/kexec.h> #include <asm/processor.h> #include <asm/time.h> -#include <asm/clock.h> #include <asm/tlbflush.h> #include <asm/cacheflush.h> #include <loongson.h>
drivers/cpufreq/loongson2_cpufreq.c +4 -18
@@ -20,7 +20,6 @@#include <linux/delay.h> #include <linux/platform_device.h> -#include <asm/clock.h> #include <asm/idle.h> #include <asm/mach-loongson2ef/loongson.h>
@@ -58,29 +57,20 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy, loongson2_clockmod_table[index].driver_data) / 8;/* setting the cpu frequency */ -clk_set_rate (policy->clk, freq *1000 ); +loongson2_cpu_set_rate (freq);return 0 ; }static int loongson2_cpufreq_cpu_init (struct cpufreq_policy *policy) { -struct clk *cpuclk;int i;unsigned long rate;int ret; - cpuclk =clk_get (NULL ,"cpu_clk" ); -if (IS_ERR (cpuclk)) { -pr_err ("couldn't get CPU clk\n" ); -return PTR_ERR (cpuclk); - } - rate = cpu_clock_freq /1000 ; -if (!rate) { -clk_put (cpuclk); +if (!rate)return -EINVAL ; - }/* clock table init */ for (i = 2;
@@ -88,20 +78,16 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy) i++) loongson2_clockmod_table[i].frequency = (rate * i) /8 ; - ret =clk_set_rate (cpuclk, rate *1000 ); -if (ret) { -clk_put (cpuclk); + ret =loongson2_cpu_set_rate (rate); +if (ret)return ret; - } - policy->clk = cpuclk;cpufreq_generic_init (policy, &loongson2_clockmod_table[0 ],0 );return 0 ; }static int loongson2_cpufreq_exit (struct cpufreq_policy *policy) { -clk_put (policy->clk);return 0 ; }
Signature · 1 line
2.26.0
Re: [PATCH] mips: loongsoon2ef: remove private clk api
Quoted 9 lines · Arnd Bergmann
As platforms are moving to
COMMON_CLKin general, loongson2ef stuck out as something that has a private implementation but does not actually use it except for setting the frequency of the CPU itself from theloongson2_cpufreqdriver.Change that driver to call the register setting function directly and remove the rest of the stub implementation.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 303 lines
--- arch/mips/include/asm/clock.h | 49 ---------- .../include/asm/mach-loongson2ef/loongson.h | 1 + arch/mips/loongson2ef/Kconfig | 1 - arch/mips/loongson2ef/lemote-2f/clock.c | 98 +------------------ arch/mips/loongson64/smp.c | 1 - drivers/cpufreq/loongson2_cpufreq.c | 22 +---- 6 files changed, 8 insertions(+), 164 deletions(-) delete mode 100644 arch/mips/include/asm/clock.harch/mips/include/asm/clock.h deleted +0
-49@@ -1,49 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_MIPS_CLOCK_H -#define __ASM_MIPS_CLOCK_H - -#include <linux/kref.h> -#include <linux/list.h> -#include <linux/seq_file.h> -#include <linux/clk.h> - -struct clk ; - -struct clk_ops { -void (*init) (struct clk *clk); -void (*enable) (struct clk *clk); -void (*disable) (struct clk *clk); -void (*recalc) (struct clk *clk); -int (*set_rate) (struct clk *clk,unsigned long rate,int algo_id); -long (*round_rate) (struct clk *clk,unsigned long rate); -}; - -struct clk { -struct list_head node; -const char *name; -int id; -struct module *owner; - -struct clk *parent; -struct clk_ops *ops; - -struct kref kref; - -unsigned long rate; -unsigned long flags; -}; - -#define CLK_ALWAYS_ENABLED (1 << 0) -#define CLK_RATE_PROPAGATES (1 << 1) - -int clk_init (void ); - -int __clk_enable (struct clk *); -void __clk_disable (struct clk *); - -void clk_recalc_rate (struct clk *); - -int clk_register (struct clk *); -void clk_unregister (struct clk *); - -#endif /* __ASM_MIPS_CLOCK_H */ arch/mips/include/asm/mach-loongson2ef/loongson.h +1
-0@@ -244,6 +244,7 @@ static inline void do_perfcnt_IRQ(void)#ifdef CONFIG_CPU_SUPPORTS_CPUFREQ #include <linux/cpufreq.h> extern struct cpufreq_frequency_table loongson2_clockmod_table[]; +extern int loongson2_cpu_set_rate (unsigned long rate_khz);#endif /* arch/mips/loongson2ef/Kconfig +0
-1@@ -46,7 +46,6 @@ config LEMOTE_MACH2F select CSRC_R4K if ! MIPS_EXTERNAL_TIMER select DMA_NONCOHERENT select GENERIC_ISA_DMA_SUPPORT_BROKEN - select HAVE_CLK select FORCE_PCI select I8259 select IRQ_MIPS_CPUarch/mips/loongson2ef/lemote-2f/clock.c +3
-95@@ -6,22 +6,12 @@* License. See the file "COPYING" in the main directory of this archive * for more details. */ -#include <linux/clk.h> #include <linux/cpufreq.h> #include <linux/errno.h> #include <linux/export.h> -#include <linux/list.h> -#include <linux/mutex.h> -#include <linux/spinlock.h> -#include <asm/clock.h> #include <asm/mach-loongson2ef/loongson.h> -static LIST_HEAD (clock_list); -static DEFINE_SPINLOCK (clock_lock); -static DEFINE_MUTEX (clock_list_sem); - -/* Minimum CLK support */ enum {DC_ZERO ,DC_25PT =2 ,DC_37PT ,DC_50PT ,DC_62PT ,DC_75PT ,DC_87PT ,DC_DISABLE ,DC_RESV @@ -41,103 +31,21 @@ struct cpufreq_frequency_table loongson2_clockmod_table[] = { };EXPORT_SYMBOL_GPL (loongson2_clockmod_table); -static struct clk cpu_clk = { - .name ="cpu_clk" , - .flags =CLK_ALWAYS_ENABLED |CLK_RATE_PROPAGATES , - .rate =800000000 , -}; - -struct clk *clk_get (struct device *dev,const char *id) -{ -return &cpu_clk; -} -EXPORT_SYMBOL (clk_get); - -static void propagate_rate (struct clk *clk) -{ -struct clk *clkp; - -list_for_each_entry (clkp, &clock_list, node) { -if (likely (clkp->parent != clk)) -continue ; -if (likely (clkp->ops && clkp->ops->recalc)) - clkp->ops->recalc (clkp); -if (unlikely (clkp->flags &CLK_RATE_PROPAGATES )) -propagate_rate (clkp); - } -} - -int clk_enable (struct clk *clk) -{ -return 0 ; -} -EXPORT_SYMBOL (clk_enable); - -void clk_disable (struct clk *clk) +int loongson2_cpu_set_rate (unsigned long rate_khz) { -} -EXPORT_SYMBOL (clk_disable); - -unsigned long clk_get_rate (struct clk *clk) -{ -if (!clk) -return 0 ; - -return (unsigned long )clk->rate; -} -EXPORT_SYMBOL (clk_get_rate); - -void clk_put (struct clk *clk) -{ -} -EXPORT_SYMBOL (clk_put); - -int clk_set_rate (struct clk *clk,unsigned long rate) -{ -unsigned int rate_khz = rate /1000 ;struct cpufreq_frequency_table *pos; -int ret =0 ;int regval; -if (likely (clk->ops && clk->ops->set_rate)) { -unsigned long flags; - -spin_lock_irqsave (&clock_lock, flags); - ret = clk->ops->set_rate (clk, rate,0 ); -spin_unlock_irqrestore (&clock_lock, flags); - } - -if (unlikely (clk->flags &CLK_RATE_PROPAGATES )) -propagate_rate (clk); -cpufreq_for_each_valid_entry (pos, loongson2_clockmod_table)if (rate_khz == pos->frequency)break ;if (rate_khz != pos->frequency)return -ENOTSUPP ; - clk->rate = rate; - regval =readl (LOONGSON_CHIPCFG ); regval = (regval & ~0x7 ) | (pos->driver_data -1 );writel (regval,LOONGSON_CHIPCFG ); -return ret; -} -EXPORT_SYMBOL_GPL (clk_set_rate); - -long clk_round_rate (struct clk *clk,unsigned long rate) -{ -if (likely (clk->ops && clk->ops->round_rate)) { -unsigned long flags, rounded; - -spin_lock_irqsave (&clock_lock, flags); - rounded = clk->ops->round_rate (clk, rate); -spin_unlock_irqrestore (&clock_lock, flags); - -return rounded; - } - -return rate; +return 0 ; } -EXPORT_SYMBOL_GPL (clk_round_rate); +EXPORT_SYMBOL_GPL (loongson2_cpu_set_rate);arch/mips/loongson64/smp.c +0
-1@@ -15,7 +15,6 @@#include <linux/kexec.h> #include <asm/processor.h> #include <asm/time.h> -#include <asm/clock.h> #include <asm/tlbflush.h> #include <asm/cacheflush.h> #include <loongson.h> drivers/cpufreq/loongson2_cpufreq.c +4
-18@@ -20,7 +20,6 @@#include <linux/delay.h> #include <linux/platform_device.h> -#include <asm/clock.h> #include <asm/idle.h> #include <asm/mach-loongson2ef/loongson.h> @@ -58,29 +57,20 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy, loongson2_clockmod_table[index].driver_data) / 8;/* setting the cpu frequency */ -clk_set_rate (policy->clk, freq *1000 ); +loongson2_cpu_set_rate (freq);return 0 ; }static int loongson2_cpufreq_cpu_init (struct cpufreq_policy *policy) { -struct clk *cpuclk;int i;unsigned long rate;int ret; - cpuclk =clk_get (NULL ,"cpu_clk" ); -if (IS_ERR (cpuclk)) { -pr_err ("couldn't get CPU clk\n" ); -return PTR_ERR (cpuclk); - } - rate = cpu_clock_freq /1000 ; -if (!rate) { -clk_put (cpuclk); +if (!rate)return -EINVAL ; - }/* clock table init */ for (i = 2;@@ -88,20 +78,16 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy) i++) loongson2_clockmod_table[i].frequency = (rate * i) /8 ; - ret =clk_set_rate (cpuclk, rate *1000 ); -if (ret) { -clk_put (cpuclk); + ret =loongson2_cpu_set_rate (rate); +if (ret)return ret; - } - policy->clk = cpuclk;cpufreq_generic_init (policy, &loongson2_clockmod_table[0 ],0 );return 0 ; }static int loongson2_cpufreq_exit (struct cpufreq_policy *policy) { -clk_put (policy->clk);return 0 ; }
Re: [PATCH] mips: loongsoon2ef: remove private clk api
In reply to Arnd BergmannQuoted 9 lines · Arnd Bergmann
As platforms are moving to
COMMON_CLKin general, loongson2ef stuck out as something that has a private implementation but does not actually use it except for setting the frequency of the CPU itself from theloongson2_cpufreqdriver.Change that driver to call the register setting function directly and remove the rest of the stub implementation.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 9 lines
--- arch/mips/include/asm/clock.h | 49 ---------- .../include/asm/mach-loongson2ef/loongson.h | 1 + arch/mips/loongson2ef/Kconfig | 1 - arch/mips/loongson2ef/lemote-2f/clock.c | 98 +------------------ arch/mips/loongson64/smp.c | 1 - drivers/cpufreq/loongson2_cpufreq.c | 22 +---- 6 files changed, 8 insertions(+), 164 deletions(-) delete mode 100644 arch/mips/include/asm/clock.h
applied to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]