diff mbox

[2/2] arm64: EXYNOS: Consolidate ARCH_EXYNOS7 symbol into ARCH_EXYNOS

Message ID 1447637775-9887-3-git-send-email-k.kozlowski@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Krzysztof Kozlowski Nov. 16, 2015, 1:36 a.m. UTC
The ARMv8 Exynos family SoCs in Linux kernel are currently:
 - Exynos5433 (controlled by ARCH_EXYNOS),
 - Exynos7 (controlled by ARCH_EXYNOS7).

It duplicates Kconfig symbols unnecessarily, so consolidate them into
one ARCH_EXYNOS. Future SoCs could fall also under the ARCH_EXYNOS
symbol.

The commit should not bring any visible functional change.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 arch/arm64/Kconfig.platforms        | 11 ++---------
 arch/arm64/boot/dts/exynos/Makefile |  2 +-
 arch/arm64/configs/defconfig        |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

Comments

Chanwoo Choi Nov. 16, 2015, 2:55 a.m. UTC | #1
Hi,

On 2015? 11? 16? 10:36, Krzysztof Kozlowski wrote:
> The ARMv8 Exynos family SoCs in Linux kernel are currently:
>  - Exynos5433 (controlled by ARCH_EXYNOS),
>  - Exynos7 (controlled by ARCH_EXYNOS7).
> 
> It duplicates Kconfig symbols unnecessarily, so consolidate them into
> one ARCH_EXYNOS. Future SoCs could fall also under the ARCH_EXYNOS
> symbol.
> 
> The commit should not bring any visible functional change.
> 
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
>  arch/arm64/Kconfig.platforms        | 11 ++---------
>  arch/arm64/boot/dts/exynos/Makefile |  2 +-
>  arch/arm64/configs/defconfig        |  2 +-
>  3 files changed, 4 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
> index 4043c35962cc..afa19baca94e 100644
> --- a/arch/arm64/Kconfig.platforms
> +++ b/arch/arm64/Kconfig.platforms
> @@ -13,21 +13,14 @@ config ARCH_BERLIN
>  	  This enables support for Marvell Berlin SoC Family
>  
>  config ARCH_EXYNOS
> -	bool
> -	help
> -	  This enables support for Samsung Exynos SoC family
> -
> -config ARCH_EXYNOS7
> -	bool "ARMv8 based Samsung Exynos7"
> -	select ARCH_EXYNOS
> +	bool "ARMv8 based Samsung Exynos SoC family"
>  	select COMMON_CLK_SAMSUNG
>  	select HAVE_S3C2410_WATCHDOG if WATCHDOG
>  	select HAVE_S3C_RTC if RTC_CLASS
>  	select PINCTRL
>  	select PINCTRL_EXYNOS
> -
>  	help
> -	  This enables support for Samsung Exynos7 SoC family
> +	  This enables support for Samsung Exynos ARMv8 SoC family
>  
>  config ARCH_LAYERSCAPE
>  	bool "ARMv8 based Freescale Layerscape SoC family"
> diff --git a/arch/arm64/boot/dts/exynos/Makefile b/arch/arm64/boot/dts/exynos/Makefile
> index 20310e5b6d6f..50c9b9383cfa 100644
> --- a/arch/arm64/boot/dts/exynos/Makefile
> +++ b/arch/arm64/boot/dts/exynos/Makefile
> @@ -1,4 +1,4 @@
> -dtb-$(CONFIG_ARCH_EXYNOS7) += exynos7-espresso.dtb
> +dtb-$(CONFIG_ARCH_EXYNOS) += exynos7-espresso.dtb
>  
>  always		:= $(dtb-y)
>  subdir-y	:= $(dts-dirs)
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index bdd7aa358d2a..a396fa7c69a5 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -33,7 +33,7 @@ CONFIG_MODULE_UNLOAD=y
>  # CONFIG_IOSCHED_DEADLINE is not set
>  CONFIG_ARCH_BCM_IPROC=y
>  CONFIG_ARCH_BERLIN=y
> -CONFIG_ARCH_EXYNOS7=y
> +CONFIG_ARCH_EXYNOS=y
>  CONFIG_ARCH_LAYERSCAPE=y
>  CONFIG_ARCH_HISI=y
>  CONFIG_ARCH_MEDIATEK=y
> 

When I sent the EXYNOS5433 patch[1], we don't want to add the each config
for each Exynos SoC. So, I think this patch is good to use only one ARCH_EXYNOS config
for all ARMv8 Exynos SoC.
[1] https://lkml.org/lkml/2015/2/24/85

Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>

Regards,
Chanwoo Choi
Pankaj Dubey Nov. 17, 2015, 4:25 a.m. UTC | #2
On Monday 16 November 2015 07:06 AM, Krzysztof Kozlowski wrote:
> The ARMv8 Exynos family SoCs in Linux kernel are currently:
>  - Exynos5433 (controlled by ARCH_EXYNOS),
>  - Exynos7 (controlled by ARCH_EXYNOS7).
> 
> It duplicates Kconfig symbols unnecessarily, so consolidate them into
> one ARCH_EXYNOS. Future SoCs could fall also under the ARCH_EXYNOS
> symbol.
> 
> The commit should not bring any visible functional change.
> 
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
>  arch/arm64/Kconfig.platforms        | 11 ++---------
>  arch/arm64/boot/dts/exynos/Makefile |  2 +-
>  arch/arm64/configs/defconfig        |  2 +-
>  3 files changed, 4 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
> index 4043c35962cc..afa19baca94e 100644
> --- a/arch/arm64/Kconfig.platforms
> +++ b/arch/arm64/Kconfig.platforms
> @@ -13,21 +13,14 @@ config ARCH_BERLIN
>  	  This enables support for Marvell Berlin SoC Family
>  
>  config ARCH_EXYNOS
> -	bool
> -	help
> -	  This enables support for Samsung Exynos SoC family
> -
> -config ARCH_EXYNOS7
> -	bool "ARMv8 based Samsung Exynos7"
> -	select ARCH_EXYNOS
> +	bool "ARMv8 based Samsung Exynos SoC family"
>  	select COMMON_CLK_SAMSUNG
>  	select HAVE_S3C2410_WATCHDOG if WATCHDOG
>  	select HAVE_S3C_RTC if RTC_CLASS
>  	select PINCTRL
>  	select PINCTRL_EXYNOS
> -
>  	help
> -	  This enables support for Samsung Exynos7 SoC family
> +	  This enables support for Samsung Exynos ARMv8 SoC family
>  
>  config ARCH_LAYERSCAPE
>  	bool "ARMv8 based Freescale Layerscape SoC family"
> diff --git a/arch/arm64/boot/dts/exynos/Makefile b/arch/arm64/boot/dts/exynos/Makefile
> index 20310e5b6d6f..50c9b9383cfa 100644
> --- a/arch/arm64/boot/dts/exynos/Makefile
> +++ b/arch/arm64/boot/dts/exynos/Makefile
> @@ -1,4 +1,4 @@
> -dtb-$(CONFIG_ARCH_EXYNOS7) += exynos7-espresso.dtb
> +dtb-$(CONFIG_ARCH_EXYNOS) += exynos7-espresso.dtb
>  
>  always		:= $(dtb-y)
>  subdir-y	:= $(dts-dirs)
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index bdd7aa358d2a..a396fa7c69a5 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -33,7 +33,7 @@ CONFIG_MODULE_UNLOAD=y
>  # CONFIG_IOSCHED_DEADLINE is not set
>  CONFIG_ARCH_BCM_IPROC=y
>  CONFIG_ARCH_BERLIN=y
> -CONFIG_ARCH_EXYNOS7=y
> +CONFIG_ARCH_EXYNOS=y
>  CONFIG_ARCH_LAYERSCAPE=y
>  CONFIG_ARCH_HISI=y
>  CONFIG_ARCH_MEDIATEK=y
> 

Reviewed-by: Pankaj Dubey <pankaj.dubey@samsung.com>

Thanks,
Pankaj Dubey
Alim Akhtar Nov. 19, 2015, 4:04 a.m. UTC | #3
Hi Krzysztof,

On 11/16/2015 07:06 AM, Krzysztof Kozlowski wrote:
> The ARMv8 Exynos family SoCs in Linux kernel are currently:
>   - Exynos5433 (controlled by ARCH_EXYNOS),
>   - Exynos7 (controlled by ARCH_EXYNOS7).
>
> It duplicates Kconfig symbols unnecessarily, so consolidate them into
> one ARCH_EXYNOS. Future SoCs could fall also under the ARCH_EXYNOS
> symbol.
>
> The commit should not bring any visible functional change.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
> Reviewed-by: Pankaj Dubey <pankaj.dubey@samsung.com>
>

Tested on exynos7-espresso board, so
Tested-by: Alim Akhtar <alim.akhtar@samsung.com>

> ---
> arch/arm64/Kconfig.platforms        | 11 ++---------
>   arch/arm64/boot/dts/exynos/Makefile |  2 +-
>   arch/arm64/configs/defconfig        |  2 +-
>   3 files changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
> index 4043c35962cc..afa19baca94e 100644
> --- a/arch/arm64/Kconfig.platforms
> +++ b/arch/arm64/Kconfig.platforms
> @@ -13,21 +13,14 @@ config ARCH_BERLIN
>   	  This enables support for Marvell Berlin SoC Family
>
>   config ARCH_EXYNOS
> -	bool
> -	help
> -	  This enables support for Samsung Exynos SoC family
> -
> -config ARCH_EXYNOS7
> -	bool "ARMv8 based Samsung Exynos7"
> -	select ARCH_EXYNOS
> +	bool "ARMv8 based Samsung Exynos SoC family"
>   	select COMMON_CLK_SAMSUNG
>   	select HAVE_S3C2410_WATCHDOG if WATCHDOG
>   	select HAVE_S3C_RTC if RTC_CLASS
>   	select PINCTRL
>   	select PINCTRL_EXYNOS
> -
>   	help
> -	  This enables support for Samsung Exynos7 SoC family
> +	  This enables support for Samsung Exynos ARMv8 SoC family
>
>   config ARCH_LAYERSCAPE
>   	bool "ARMv8 based Freescale Layerscape SoC family"
> diff --git a/arch/arm64/boot/dts/exynos/Makefile b/arch/arm64/boot/dts/exynos/Makefile
> index 20310e5b6d6f..50c9b9383cfa 100644
> --- a/arch/arm64/boot/dts/exynos/Makefile
> +++ b/arch/arm64/boot/dts/exynos/Makefile
> @@ -1,4 +1,4 @@
> -dtb-$(CONFIG_ARCH_EXYNOS7) += exynos7-espresso.dtb
> +dtb-$(CONFIG_ARCH_EXYNOS) += exynos7-espresso.dtb
>
>   always		:= $(dtb-y)
>   subdir-y	:= $(dts-dirs)
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index bdd7aa358d2a..a396fa7c69a5 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -33,7 +33,7 @@ CONFIG_MODULE_UNLOAD=y
>   # CONFIG_IOSCHED_DEADLINE is not set
>   CONFIG_ARCH_BCM_IPROC=y
>   CONFIG_ARCH_BERLIN=y
> -CONFIG_ARCH_EXYNOS7=y
> +CONFIG_ARCH_EXYNOS=y
>   CONFIG_ARCH_LAYERSCAPE=y
>   CONFIG_ARCH_HISI=y
>   CONFIG_ARCH_MEDIATEK=y
>
Tomasz Figa Nov. 19, 2015, 4:23 a.m. UTC | #4
Hi Krzysztof,

2015-11-16 10:36 GMT+09:00 Krzysztof Kozlowski <k.kozlowski@samsung.com>:
> The ARMv8 Exynos family SoCs in Linux kernel are currently:
>  - Exynos5433 (controlled by ARCH_EXYNOS),
>  - Exynos7 (controlled by ARCH_EXYNOS7).
>
> It duplicates Kconfig symbols unnecessarily, so consolidate them into
> one ARCH_EXYNOS. Future SoCs could fall also under the ARCH_EXYNOS
> symbol.
>
> The commit should not bring any visible functional change.

I think this basically matches the general recommendation for ARM64,
so excluding the single nitpick inline and assuming that, after this
patch, grep ARCH_EXYNOS7 gives no results:

Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>

>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
>  arch/arm64/Kconfig.platforms        | 11 ++---------
>  arch/arm64/boot/dts/exynos/Makefile |  2 +-
>  arch/arm64/configs/defconfig        |  2 +-
>  3 files changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
> index 4043c35962cc..afa19baca94e 100644
> --- a/arch/arm64/Kconfig.platforms
> +++ b/arch/arm64/Kconfig.platforms
> @@ -13,21 +13,14 @@ config ARCH_BERLIN
>           This enables support for Marvell Berlin SoC Family
>
>  config ARCH_EXYNOS
> -       bool
> -       help
> -         This enables support for Samsung Exynos SoC family
> -
> -config ARCH_EXYNOS7
> -       bool "ARMv8 based Samsung Exynos7"
> -       select ARCH_EXYNOS
> +       bool "ARMv8 based Samsung Exynos SoC family"
>         select COMMON_CLK_SAMSUNG
>         select HAVE_S3C2410_WATCHDOG if WATCHDOG
>         select HAVE_S3C_RTC if RTC_CLASS
>         select PINCTRL
>         select PINCTRL_EXYNOS
> -
>         help
> -         This enables support for Samsung Exynos7 SoC family
> +         This enables support for Samsung Exynos ARMv8 SoC family

nit: Sounds a little bit strange. Maybe "This enables support for
ARMv8 based Samsung Exynos SoC family"?

Best regards,
Tomasz
Krzysztof Kozlowski Nov. 19, 2015, 4:36 a.m. UTC | #5
On 19.11.2015 13:23, Tomasz Figa wrote:
> Hi Krzysztof,
> 
> 2015-11-16 10:36 GMT+09:00 Krzysztof Kozlowski <k.kozlowski@samsung.com>:
>> The ARMv8 Exynos family SoCs in Linux kernel are currently:
>>  - Exynos5433 (controlled by ARCH_EXYNOS),
>>  - Exynos7 (controlled by ARCH_EXYNOS7).
>>
>> It duplicates Kconfig symbols unnecessarily, so consolidate them into
>> one ARCH_EXYNOS. Future SoCs could fall also under the ARCH_EXYNOS
>> symbol.
>>
>> The commit should not bring any visible functional change.
> 
> I think this basically matches the general recommendation for ARM64,
> so excluding the single nitpick inline and assuming that, after this
> patch, grep ARCH_EXYNOS7 gives no results:
> 
> Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>
> 
>>
>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>> ---
>>  arch/arm64/Kconfig.platforms        | 11 ++---------
>>  arch/arm64/boot/dts/exynos/Makefile |  2 +-
>>  arch/arm64/configs/defconfig        |  2 +-
>>  3 files changed, 4 insertions(+), 11 deletions(-)
>>
>> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
>> index 4043c35962cc..afa19baca94e 100644
>> --- a/arch/arm64/Kconfig.platforms
>> +++ b/arch/arm64/Kconfig.platforms
>> @@ -13,21 +13,14 @@ config ARCH_BERLIN
>>           This enables support for Marvell Berlin SoC Family
>>
>>  config ARCH_EXYNOS
>> -       bool
>> -       help
>> -         This enables support for Samsung Exynos SoC family
>> -
>> -config ARCH_EXYNOS7
>> -       bool "ARMv8 based Samsung Exynos7"
>> -       select ARCH_EXYNOS
>> +       bool "ARMv8 based Samsung Exynos SoC family"
>>         select COMMON_CLK_SAMSUNG
>>         select HAVE_S3C2410_WATCHDOG if WATCHDOG
>>         select HAVE_S3C_RTC if RTC_CLASS
>>         select PINCTRL
>>         select PINCTRL_EXYNOS
>> -
>>         help
>> -         This enables support for Samsung Exynos7 SoC family
>> +         This enables support for Samsung Exynos ARMv8 SoC family
> 
> nit: Sounds a little bit strange. Maybe "This enables support for
> ARMv8 based Samsung Exynos SoC family"?

Sure, sounds better.

Thanks for feedback!

BR,
Krzysztof
diff mbox

Patch

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 4043c35962cc..afa19baca94e 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -13,21 +13,14 @@  config ARCH_BERLIN
 	  This enables support for Marvell Berlin SoC Family
 
 config ARCH_EXYNOS
-	bool
-	help
-	  This enables support for Samsung Exynos SoC family
-
-config ARCH_EXYNOS7
-	bool "ARMv8 based Samsung Exynos7"
-	select ARCH_EXYNOS
+	bool "ARMv8 based Samsung Exynos SoC family"
 	select COMMON_CLK_SAMSUNG
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select PINCTRL
 	select PINCTRL_EXYNOS
-
 	help
-	  This enables support for Samsung Exynos7 SoC family
+	  This enables support for Samsung Exynos ARMv8 SoC family
 
 config ARCH_LAYERSCAPE
 	bool "ARMv8 based Freescale Layerscape SoC family"
diff --git a/arch/arm64/boot/dts/exynos/Makefile b/arch/arm64/boot/dts/exynos/Makefile
index 20310e5b6d6f..50c9b9383cfa 100644
--- a/arch/arm64/boot/dts/exynos/Makefile
+++ b/arch/arm64/boot/dts/exynos/Makefile
@@ -1,4 +1,4 @@ 
-dtb-$(CONFIG_ARCH_EXYNOS7) += exynos7-espresso.dtb
+dtb-$(CONFIG_ARCH_EXYNOS) += exynos7-espresso.dtb
 
 always		:= $(dtb-y)
 subdir-y	:= $(dts-dirs)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index bdd7aa358d2a..a396fa7c69a5 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -33,7 +33,7 @@  CONFIG_MODULE_UNLOAD=y
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_BCM_IPROC=y
 CONFIG_ARCH_BERLIN=y
-CONFIG_ARCH_EXYNOS7=y
+CONFIG_ARCH_EXYNOS=y
 CONFIG_ARCH_LAYERSCAPE=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_MEDIATEK=y