[PATCH v3 02/15] ARM: socfpga: introduce common ARCH_INTEL_SOCFPGA

[Dinh Nguyen]

On 3/11/21 9:25 AM, Krzysztof Kozlowski wrote:
> Simplify 32-bit and 64-bit Intel SoCFPGA Kconfig options by having only
> one for both of them.  This the common practice for other platforms.
> Additionally, the ARCH_SOCFPGA is too generic as SoCFPGA designs come
> from multiple vendors.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski at canonical.com>
> ---
>   arch/arm/Kconfig                    | 2 +-
>   arch/arm/Kconfig.debug              | 6 +++---
>   arch/arm/Makefile                   | 2 +-
>   arch/arm/boot/dts/Makefile          | 2 +-
>   arch/arm/mach-socfpga/Kconfig       | 4 ++++
>   arch/arm64/Kconfig.platforms        | 4 ++++
>   arch/arm64/boot/dts/altera/Makefile | 2 +-
>   7 files changed, 15 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 853aab5ab327..37f94cf0cfdb 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1320,7 +1320,7 @@ config ARM_PSCI
>   # selected platforms.
>   config ARCH_NR_GPIO
>   	int
> -	default 2048 if ARCH_SOCFPGA
> +	default 2048 if ARCH_INTEL_SOCFPGA
>   	default 1024 if ARCH_BRCMSTB || ARCH_RENESAS || ARCH_TEGRA || \
>   		ARCH_ZYNQ || ARCH_ASPEED
>   	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 9e0b5e7f12af..36016497b1b3 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -1087,7 +1087,7 @@ choice
>   		  on SD5203 UART.
>   
>   	config DEBUG_SOCFPGA_UART0
> -		depends on ARCH_SOCFPGA
> +		depends on ARCH_INTEL_SOCFPGA
>   		bool "Use SOCFPGA UART0 for low-level debug"
>   		select DEBUG_UART_8250
>   		help
> @@ -1095,7 +1095,7 @@ choice
>   		  on SOCFPGA(Cyclone 5 and Arria 5) based platforms.
>   
>   	config DEBUG_SOCFPGA_ARRIA10_UART1
> -		depends on ARCH_SOCFPGA
> +		depends on ARCH_INTEL_SOCFPGA
>   		bool "Use SOCFPGA Arria10 UART1 for low-level debug"
>   		select DEBUG_UART_8250
>   		help
> @@ -1103,7 +1103,7 @@ choice
>   		  on SOCFPGA(Arria 10) based platforms.
>   
>   	config DEBUG_SOCFPGA_CYCLONE5_UART1
> -		depends on ARCH_SOCFPGA
> +		depends on ARCH_INTEL_SOCFPGA
>   		bool "Use SOCFPGA Cyclone 5 UART1 for low-level debug"
>   		select DEBUG_UART_8250
>   		help
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index dad5502ecc28..415c3514573a 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -209,7 +209,7 @@ machine-$(CONFIG_PLAT_SAMSUNG)		+= s3c
>   machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210
>   machine-$(CONFIG_ARCH_SA1100)		+= sa1100
>   machine-$(CONFIG_ARCH_RENESAS)	 	+= shmobile
> -machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
> +machine-$(CONFIG_ARCH_INTEL_SOCFPGA)	+= socfpga
>   machine-$(CONFIG_ARCH_STI)		+= sti
>   machine-$(CONFIG_ARCH_STM32)		+= stm32
>   machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 53b6e06bf19a..fe8f7c349f1d 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1033,7 +1033,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
>   	s5pv210-smdkc110.dtb \
>   	s5pv210-smdkv210.dtb \
>   	s5pv210-torbreck.dtb
> -dtb-$(CONFIG_ARCH_SOCFPGA) += \
> +dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \
>   	socfpga_arria5_socdk.dtb \
>   	socfpga_arria10_socdk_nand.dtb \
>   	socfpga_arria10_socdk_qspi.dtb \
> diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
> index c3bb68d57cea..e43ed0ca6860 100644
> --- a/arch/arm/mach-socfpga/Kconfig
> +++ b/arch/arm/mach-socfpga/Kconfig
> @@ -2,6 +2,7 @@
>   menuconfig ARCH_SOCFPGA
>   	bool "Altera SOCFPGA family"
>   	depends on ARCH_MULTI_V7
> +	select ARCH_INTEL_SOCFPGA
>   	select ARCH_SUPPORTS_BIG_ENDIAN
>   	select ARM_AMBA
>   	select ARM_GIC
> @@ -20,6 +21,9 @@ menuconfig ARCH_SOCFPGA
>   	select PL310_ERRATA_769419
>   
>   if ARCH_SOCFPGA
> +config ARCH_INTEL_SOCFPGA
> +	bool
> +
>   config SOCFPGA_SUSPEND
>   	bool "Suspend to RAM on SOCFPGA"
>   	help
> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
> index cdfd5fed457f..ecab67a1afb8 100644
> --- a/arch/arm64/Kconfig.platforms
> +++ b/arch/arm64/Kconfig.platforms
> @@ -256,9 +256,13 @@ config ARCH_SEATTLE
>   
>   config ARCH_STRATIX10
>   	bool "Altera's Stratix 10 SoCFPGA Family"
> +	select ARCH_INTEL_SOCFPGA
>   	help
>   	  This enables support for Altera's Stratix 10 SoCFPGA Family.
>   
> +config ARCH_INTEL_SOCFPGA
> +	bool
> +
>   config ARCH_SYNQUACER
>   	bool "Socionext SynQuacer SoC Family"
>   
> diff --git a/arch/arm64/boot/dts/altera/Makefile b/arch/arm64/boot/dts/altera/Makefile
> index 10119c7ab437..4db83fbeb115 100644
> --- a/arch/arm64/boot/dts/altera/Makefile
> +++ b/arch/arm64/boot/dts/altera/Makefile
> @@ -1,3 +1,3 @@
>   # SPDX-License-Identifier: GPL-2.0-only
> -dtb-$(CONFIG_ARCH_STRATIX10) += socfpga_stratix10_socdk.dtb \
> +dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga_stratix10_socdk.dtb \
>   				socfpga_stratix10_socdk_nand.dtb
> 

Acked-by: Dinh Nguyen <dinguyen at kernel.org>