Skip to content

Commit 3ac7ca5

Browse files
Gabriel-Fernandzbebarino
authored andcommitted
clk: stm32mp1: move stm32mp1 clock driver into stm32 directory
Move all STM32MP clock drivers into same directory (stm32). Signed-off-by: Gabriel Fernandez <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Stephen Boyd <[email protected]>
1 parent b85ea95 commit 3ac7ca5

File tree

5 files changed

+31
-11
lines changed

5 files changed

+31
-11
lines changed

drivers/clk/Kconfig

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -414,16 +414,6 @@ config COMMON_CLK_VC7
414414
Renesas Versaclock7 is a family of configurable clock generator
415415
and jitter attenuator ICs with fractional and integer dividers.
416416

417-
config COMMON_CLK_STM32MP135
418-
def_bool COMMON_CLK && MACH_STM32MP13
419-
help
420-
Support for stm32mp135 SoC family clocks
421-
422-
config COMMON_CLK_STM32MP157
423-
def_bool COMMON_CLK && MACH_STM32MP157
424-
help
425-
Support for stm32mp157 SoC family clocks
426-
427417
config COMMON_CLK_STM32F
428418
def_bool COMMON_CLK && (MACH_STM32F429 || MACH_STM32F469 || MACH_STM32F746)
429419
help
@@ -504,6 +494,7 @@ source "drivers/clk/starfive/Kconfig"
504494
source "drivers/clk/sunxi/Kconfig"
505495
source "drivers/clk/sunxi-ng/Kconfig"
506496
source "drivers/clk/tegra/Kconfig"
497+
source "drivers/clk/stm32/Kconfig"
507498
source "drivers/clk/ti/Kconfig"
508499
source "drivers/clk/uniphier/Kconfig"
509500
source "drivers/clk/visconti/Kconfig"

drivers/clk/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o
7070
obj-$(CONFIG_COMMON_CLK_SP7021) += clk-sp7021.o
7171
obj-$(CONFIG_COMMON_CLK_STM32F) += clk-stm32f4.o
7272
obj-$(CONFIG_COMMON_CLK_STM32H7) += clk-stm32h7.o
73-
obj-$(CONFIG_COMMON_CLK_STM32MP157) += clk-stm32mp1.o
7473
obj-$(CONFIG_COMMON_CLK_TPS68470) += clk-tps68470.o
7574
obj-$(CONFIG_CLK_TWL6040) += clk-twl6040.o
7675
obj-$(CONFIG_CLK_TWL) += clk-twl.o

drivers/clk/stm32/Kconfig

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
# common clock support for STMicroelectronics SoC family.
3+
4+
menuconfig COMMON_CLK_STM32MP
5+
bool "Clock support for common STM32MP clocks"
6+
depends on ARCH_STM32 || COMPILE_TEST
7+
default y
8+
select RESET_CONTROLLER
9+
help
10+
Support for STM32MP SoC family clocks.
11+
12+
if COMMON_CLK_STM32MP
13+
14+
config COMMON_CLK_STM32MP135
15+
bool "Clock driver for stm32mp13x clocks"
16+
depends on ARM || COMPILE_TEST
17+
default y
18+
help
19+
Support for stm32mp13x SoC family clocks.
20+
21+
config COMMON_CLK_STM32MP157
22+
bool "Clock driver for stm32mp15x clocks"
23+
depends on ARM || COMPILE_TEST
24+
default y
25+
help
26+
Support for stm32mp15x SoC family clocks.
27+
28+
endif
29+

drivers/clk/stm32/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
obj-$(CONFIG_COMMON_CLK_STM32MP135) += clk-stm32mp13.o clk-stm32-core.o reset-stm32.o
2+
obj-$(CONFIG_COMMON_CLK_STM32MP157) += clk-stm32mp1.o
File renamed without changes.

0 commit comments

Comments
 (0)