Commit ba87f200 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_update_for_v5.13' of... 

Merge tag 'socfpga_update_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/drivers

SoCFPGA updates for v5.13
- Patches from Krzysztof Kozlowski the cleans up and consolidate support for
  SoCFPGA platforms
	- Rename ARCH_SOCFPGA into ARCH_INTEL_SOCFPGA
	- Consolidate ARCH_STRATIX10 into ARCH_INTEL_SOCFPGA
	- Consolidate ARCH_AGILEX into ARCH_INTEL_SOCFPGA
	- Consolidate ARCH_N5X into ARCH_INTEL_SOCFPGA

* tag 'socfpga_update_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: drop ARCH_SOCFPGA
  reset: socfpga: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs
  i2c: altera: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs
  fpga: altera: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs
  dmaengine: socfpga: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs
  clk: socfpga: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs (and compile test)
  clk: socfpga: allow compile testing of Stratix 10 / Agilex clocks
  arm64: socfpga: merge Agilex and N5X into ARCH_INTEL_SOCFPGA
  EDAC: altera: merge ARCH_SOCFPGA and ARCH_STRATIX10
  clk: socfpga: merge ARCH_SOCFPGA and ARCH_STRATIX10
  clk: socfpga: build together Stratix 10, Agilex and N5X clock drivers
  net: stmmac: merge ARCH_SOCFPGA and ARCH_STRATIX10
  mfd: altera: merge ARCH_SOCFPGA and ARCH_STRATIX10
  ARM: socfpga: introduce common ARCH_INTEL_SOCFPGA
  clk: socfpga: allow building N5X clocks with ARCH_N5X

Link: https://lore.kernel.org/r/20210330110430.558182-1-dinguyen@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3e7f2f29 4483397b

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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 || \

arch/arm/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -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

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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 \

arch/arm/configs/multi_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ CONFIG_ARCH_MSM8960=y 
CONFIG_ARCH_MSM8974=y

CONFIG_ARCH_ROCKCHIP=y

CONFIG_ARCH_RENESAS=y

CONFIG_ARCH_SOCFPGA=y

CONFIG_ARCH_INTEL_SOCFPGA=y

CONFIG_PLAT_SPEAR=y

CONFIG_ARCH_SPEAR13XX=y

CONFIG_MACH_SPEAR1310=y