[2/2] reset: sti: simplify driver's config and build

Message ID 20230330112347.31137-2-lukas.bulwahn@gmail.com
State New
Headers
Series [1/2] ARM: sti: remove configs SOC_STIH415 and SOC_STIH416 |

Commit Message

Lukas Bulwahn March 30, 2023, 11:23 a.m. UTC
  With commit 64933513e461 ("reset: sti: Remove STiH415/6 reset support"),
there is only one sti reset driver left and there no need to define a
dedicated config STI_RESET_SYSCFG, which is selected by the config for the
STiH407 reset driver.

Simply add reset-syscfg.c to the build for the STiH407 reset driver.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
 drivers/reset/sti/Kconfig  | 4 ----
 drivers/reset/sti/Makefile | 4 +---
 2 files changed, 1 insertion(+), 7 deletions(-)
  

Comments

Patrice CHOTARD March 31, 2023, 7:22 a.m. UTC | #1
On 3/30/23 13:23, Lukas Bulwahn wrote:
> With commit 64933513e461 ("reset: sti: Remove STiH415/6 reset support"),
> there is only one sti reset driver left and there no need to define a
> dedicated config STI_RESET_SYSCFG, which is selected by the config for the
> STiH407 reset driver.
> 
> Simply add reset-syscfg.c to the build for the STiH407 reset driver.
> 
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
>  drivers/reset/sti/Kconfig  | 4 ----
>  drivers/reset/sti/Makefile | 4 +---
>  2 files changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/reset/sti/Kconfig b/drivers/reset/sti/Kconfig
> index 9455e1c7a5aa..a2622e146b8b 100644
> --- a/drivers/reset/sti/Kconfig
> +++ b/drivers/reset/sti/Kconfig
> @@ -1,11 +1,7 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  if ARCH_STI
>  
> -config STI_RESET_SYSCFG
> -	bool
> -
>  config STIH407_RESET
>  	bool
> -	select STI_RESET_SYSCFG
>  
>  endif
> diff --git a/drivers/reset/sti/Makefile b/drivers/reset/sti/Makefile
> index 3eb30f7e8e3d..5e833496cee3 100644
> --- a/drivers/reset/sti/Makefile
> +++ b/drivers/reset/sti/Makefile
> @@ -1,4 +1,2 @@
>  # SPDX-License-Identifier: GPL-2.0-only
> -obj-$(CONFIG_STI_RESET_SYSCFG) += reset-syscfg.o
> -
> -obj-$(CONFIG_STIH407_RESET) += reset-stih407.o
> +obj-$(CONFIG_STIH407_RESET) += reset-stih407.o reset-syscfg.o

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

Thanks
Patrice
  

Patch

diff --git a/drivers/reset/sti/Kconfig b/drivers/reset/sti/Kconfig
index 9455e1c7a5aa..a2622e146b8b 100644
--- a/drivers/reset/sti/Kconfig
+++ b/drivers/reset/sti/Kconfig
@@ -1,11 +1,7 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 if ARCH_STI
 
-config STI_RESET_SYSCFG
-	bool
-
 config STIH407_RESET
 	bool
-	select STI_RESET_SYSCFG
 
 endif
diff --git a/drivers/reset/sti/Makefile b/drivers/reset/sti/Makefile
index 3eb30f7e8e3d..5e833496cee3 100644
--- a/drivers/reset/sti/Makefile
+++ b/drivers/reset/sti/Makefile
@@ -1,4 +1,2 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_STI_RESET_SYSCFG) += reset-syscfg.o
-
-obj-$(CONFIG_STIH407_RESET) += reset-stih407.o
+obj-$(CONFIG_STIH407_RESET) += reset-stih407.o reset-syscfg.o