[PATCH v2 1/3] clk: Add directory for STM32 clock drivers

[Patrice CHOTARD]

Hi Patrick

On 5/19/22 17:56, Patrick Delaunay wrote:
> Add a directory in drivers/clk to regroup the clock drivers for all
> STM32 Soc with CONFIG_ARCH_STM32 (MCUs with cortex M) or
> CONFIG_ARCH_STM32MP (MPUs with cortex A).
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> 
> Changes in v2:
> - replace '_' by '-' in file names to be consistant with other clk drivers
>   and prepare introduction of new files for stm32mp13
> 
>  MAINTAINERS                                   |  2 +-
>  drivers/clk/Kconfig                           | 17 +-------------
>  drivers/clk/Makefile                          |  5 ++--
>  drivers/clk/stm32/Kconfig                     | 23 +++++++++++++++++++
>  drivers/clk/stm32/Makefile                    |  7 ++++++
>  .../clk/{clk_stm32f.c => stm32/clk-stm32f.c}  |  0
>  .../{clk_stm32h7.c => stm32/clk-stm32h7.c}    |  0
>  .../{clk_stm32mp1.c => stm32/clk-stm32mp1.c}  |  0
>  8 files changed, 34 insertions(+), 20 deletions(-)
>  create mode 100644 drivers/clk/stm32/Kconfig
>  create mode 100644 drivers/clk/stm32/Makefile
>  rename drivers/clk/{clk_stm32f.c => stm32/clk-stm32f.c} (100%)
>  rename drivers/clk/{clk_stm32h7.c => stm32/clk-stm32h7.c} (100%)
>  rename drivers/clk/{clk_stm32mp1.c => stm32/clk-stm32mp1.c} (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 56be0bfad0..3f37edd716 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -469,7 +469,7 @@ S:	Maintained
>  F:	arch/arm/mach-stm32mp/
>  F:	doc/board/st/
>  F:	drivers/adc/stm32-adc*
> -F:	drivers/clk/clk_stm32mp1.c
> +F:	drivers/clk/stm32/
>  F:	drivers/gpio/stm32_gpio.c
>  F:	drivers/hwspinlock/stm32_hwspinlock.c
>  F:	drivers/i2c/stm32f7_i2c.c
> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
> index a62b81a123..fd9e1a80c6 100644
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@ -166,22 +166,6 @@ config CLK_SCMI
>  	  by a SCMI agent based on SCMI clock protocol communication
>  	  with a SCMI server.
>  
> -config CLK_STM32F
> -	bool "Enable clock driver support for STM32F family"
> -	depends on CLK && (STM32F7 || STM32F4)
> -	default y
> -	help
> -	  This clock driver adds support for RCC clock management
> -	  for STM32F4 and STM32F7 SoCs.
> -
> -config CLK_STM32MP1
> -	bool "Enable RCC clock driver for STM32MP1"
> -	depends on ARCH_STM32MP && CLK
> -	default y
> -	help
> -	  Enable the STM32 clock (RCC) driver. Enable support for
> -	  manipulating STM32MP1's on-SoC clocks.
> -
>  config CLK_HSDK
>  	bool "Enable cgu clock driver for HSDK boards"
>  	depends on CLK && TARGET_HSDK
> @@ -251,6 +235,7 @@ source "drivers/clk/owl/Kconfig"
>  source "drivers/clk/renesas/Kconfig"
>  source "drivers/clk/sunxi/Kconfig"
>  source "drivers/clk/sifive/Kconfig"
> +source "drivers/clk/stm32/Kconfig"
>  source "drivers/clk/tegra/Kconfig"
>  source "drivers/clk/ti/Kconfig"
>  source "drivers/clk/uniphier/Kconfig"
> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> index f5b553172c..c274cda77c 100644
> --- a/drivers/clk/Makefile
> +++ b/drivers/clk/Makefile
> @@ -23,6 +23,8 @@ obj-$(CONFIG_ARCH_MTMIPS) += mtmips/
>  obj-$(CONFIG_ARCH_NPCM) += nuvoton/
>  obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
>  obj-$(CONFIG_ARCH_SOCFPGA) += altera/
> +obj-$(CONFIG_ARCH_STM32) += stm32/
> +obj-$(CONFIG_ARCH_STM32MP) += stm32/
>  obj-$(CONFIG_ARCH_SUNXI) += sunxi/
>  obj-$(CONFIG_CLK_AT91) += at91/
>  obj-$(CONFIG_CLK_BCM6345) += clk_bcm6345.o
> @@ -39,8 +41,6 @@ obj-$(CONFIG_CLK_OWL) += owl/
>  obj-$(CONFIG_CLK_RENESAS) += renesas/
>  obj-$(CONFIG_CLK_SCMI) += clk_scmi.o
>  obj-$(CONFIG_CLK_SIFIVE) += sifive/
> -obj-$(CONFIG_CLK_STM32F) += clk_stm32f.o
> -obj-$(CONFIG_CLK_STM32MP1) += clk_stm32mp1.o
>  obj-$(CONFIG_CLK_UNIPHIER) += uniphier/
>  obj-$(CONFIG_CLK_VERSACLOCK) += clk_versaclock.o
>  obj-$(CONFIG_CLK_VERSAL) += clk_versal.o
> @@ -53,4 +53,3 @@ obj-$(CONFIG_MACH_PIC32) += clk_pic32.o
>  obj-$(CONFIG_SANDBOX_CLK_CCF) += clk_sandbox_ccf.o
>  obj-$(CONFIG_SANDBOX) += clk_sandbox.o
>  obj-$(CONFIG_SANDBOX) += clk_sandbox_test.o
> -obj-$(CONFIG_STM32H7) += clk_stm32h7.o
> diff --git a/drivers/clk/stm32/Kconfig b/drivers/clk/stm32/Kconfig
> new file mode 100644
> index 0000000000..eac3fc1e9d
> --- /dev/null
> +++ b/drivers/clk/stm32/Kconfig
> @@ -0,0 +1,23 @@
> +config CLK_STM32F
> +	bool "Enable clock driver support for STM32F family"
> +	depends on CLK && (STM32F7 || STM32F4)
> +	default y
> +	help
> +	  This clock driver adds support for RCC clock management
> +	  for STM32F4 and STM32F7 SoCs.
> +
> +config CLK_STM32H7
> +	bool "Enable clock driver support for STM32H7 family"
> +	depends on CLK && STM32H7
> +	default y
> +	help
> +	  This clock driver adds support for RCC clock management
> +	  for STM32H7 SoCs.
> +
> +config CLK_STM32MP1
> +	bool "Enable RCC clock driver for STM32MP15"
> +	depends on ARCH_STM32MP && CLK
> +	default y if STM32MP15x
> +	help
> +	  Enable the STM32 clock (RCC) driver. Enable support for
> +	  manipulating STM32MP15's on-SoC clocks.
> diff --git a/drivers/clk/stm32/Makefile b/drivers/clk/stm32/Makefile
> new file mode 100644
> index 0000000000..f66f295403
> --- /dev/null
> +++ b/drivers/clk/stm32/Makefile
> @@ -0,0 +1,7 @@
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +#
> +# Copyright (C) 2022, STMicroelectronics - All Rights Reserved
> +
> +obj-$(CONFIG_CLK_STM32F) += clk-stm32f.o
> +obj-$(CONFIG_CLK_STM32H7) += clk-stm32h7.o
> +obj-$(CONFIG_CLK_STM32MP1) += clk-stm32mp1.o
> diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/stm32/clk-stm32f.c
> similarity index 100%
> rename from drivers/clk/clk_stm32f.c
> rename to drivers/clk/stm32/clk-stm32f.c
> diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/stm32/clk-stm32h7.c
> similarity index 100%
> rename from drivers/clk/clk_stm32h7.c
> rename to drivers/clk/stm32/clk-stm32h7.c
> diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/stm32/clk-stm32mp1.c
> similarity index 100%
> rename from drivers/clk/clk_stm32mp1.c
> rename to drivers/clk/stm32/clk-stm32mp1.c


Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>

Thanks
Patrice