[PATCH 1/2] ARM: sti: remove configs SOC_STIH415 and SOC_STIH416

[PATCH 1/2] ARM: sti: remove configs SOC_STIH415 and SOC_STIH416

[Lukas Bulwahn]

Commit b4bba92dfbe2 ("drm/sti: remove stih415-416 platform support")
removes the reference to configs SOC_STIH415 and SOC_STIH416 in the
config DRM_STI. Commit 64933513e461 ("reset: sti: Remove STiH415/6 reset
support") removes the two configs STIH41{5,6}_RESET.

With those changes, the two configs SOC_STIH415 and SOC_STIH416 has no
remaining effect. Remove them.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
 arch/arm/mach-sti/Kconfig | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index b2d45cf10a3c..8c21dccb61b7 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -26,24 +26,6 @@ menuconfig ARCH_STI
 
 if ARCH_STI
 
-config SOC_STIH415
-	bool "STiH415 STMicroelectronics Consumer Electronics family"
-	default y
-	help
-	  This enables support for STMicroelectronics Digital Consumer
-	  Electronics family StiH415 parts, primarily targeted at set-top-box
-	  and other digital audio/video applications using Flattned Device
-	  Trees.
-
-config SOC_STIH416
-	bool "STiH416 STMicroelectronics Consumer Electronics family"
-	default y
-	help
-	  This enables support for STMicroelectronics Digital Consumer
-	  Electronics family StiH416 parts, primarily targeted at set-top-box
-	  and other digital audio/video applications using Flattened Device
-	  Trees.
-
 config SOC_STIH407
 	bool "STiH407 STMicroelectronics Consumer Electronics family"
 	default y
-- 
2.17.1

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

[Lukas Bulwahn]

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
-- 
2.17.1

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

[Patrice CHOTARD]

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

Re: [PATCH 1/2] ARM: sti: remove configs SOC_STIH415 and SOC_STIH416

[Patrice CHOTARD]

On 3/30/23 13:23, Lukas Bulwahn wrote:
> Commit b4bba92dfbe2 ("drm/sti: remove stih415-416 platform support")
> removes the reference to configs SOC_STIH415 and SOC_STIH416 in the
> config DRM_STI. Commit 64933513e461 ("reset: sti: Remove STiH415/6 reset
> support") removes the two configs STIH41{5,6}_RESET.
> 
> With those changes, the two configs SOC_STIH415 and SOC_STIH416 has no
> remaining effect. Remove them.
> 
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
>  arch/arm/mach-sti/Kconfig | 18 ------------------
>  1 file changed, 18 deletions(-)
> 
> diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
> index b2d45cf10a3c..8c21dccb61b7 100644
> --- a/arch/arm/mach-sti/Kconfig
> +++ b/arch/arm/mach-sti/Kconfig
> @@ -26,24 +26,6 @@ menuconfig ARCH_STI
>  
>  if ARCH_STI
>  
> -config SOC_STIH415
> -	bool "STiH415 STMicroelectronics Consumer Electronics family"
> -	default y
> -	help
> -	  This enables support for STMicroelectronics Digital Consumer
> -	  Electronics family StiH415 parts, primarily targeted at set-top-box
> -	  and other digital audio/video applications using Flattned Device
> -	  Trees.
> -
> -config SOC_STIH416
> -	bool "STiH416 STMicroelectronics Consumer Electronics family"
> -	default y
> -	help
> -	  This enables support for STMicroelectronics Digital Consumer
> -	  Electronics family StiH416 parts, primarily targeted at set-top-box
> -	  and other digital audio/video applications using Flattened Device
> -	  Trees.
> -
>  config SOC_STIH407
>  	bool "STiH407 STMicroelectronics Consumer Electronics family"
>  	default y

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

Thanks
Patrice