Commit 3ef628c3 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'microchip-soc-7.1' of... 

Merge tag 'microchip-soc-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/arm

Microchip ARM64 SoC updates for v7.1

This update includes:
- use a top-level configuration flag for all Microchip platforms

* tag 'microchip-soc-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  arm64: Kconfig: provide a top-level switch for Microchip platforms

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents 16695153 e4ffa98a

arch/arm64/Kconfig.platforms

+4 −6
Original line number Diff line number Diff line
@@ -188,16 +188,15 @@ config ARCH_MESON 
	  This enables support for the arm64 based Amlogic SoCs

	  such as the s905, S905X/D, S912, A113X/D or S905X/D2



menu "Microchip SoC support"

menuconfig ARCH_MICROCHIP

	bool "Microchip SoC support"



config ARCH_MICROCHIP

	bool

if ARCH_MICROCHIP



config ARCH_LAN969X

	bool "Microchip LAN969X SoC family"

	select PINCTRL

	select DW_APB_TIMER_OF

	select ARCH_MICROCHIP

	help

	  This enables support for the Microchip LAN969X ARMv8-based

	  SoC family of TSN-capable gigabit switches.
@@ -212,7 +211,6 @@ config ARCH_SPARX5 
	bool "Microchip Sparx5 SoC family"

	select PINCTRL

	select DW_APB_TIMER_OF

	select ARCH_MICROCHIP

	help

	  This enables support for the Microchip Sparx5 ARMv8-based

	  SoC family of TSN-capable gigabit switches.
@@ -223,7 +221,7 @@ config ARCH_SPARX5 
	  security through TCAM-based frame processing using versatile

	  content aware processor (VCAP).



endmenu

endif



config ARCH_MMP

	bool "Marvell MMP SoC Family"

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ CONFIG_ARCH_HISI=y 
CONFIG_ARCH_KEEMBAY=y

CONFIG_ARCH_MEDIATEK=y

CONFIG_ARCH_MESON=y

CONFIG_ARCH_MICROCHIP=y

CONFIG_ARCH_MVEBU=y

CONFIG_ARCH_NXP=y

CONFIG_ARCH_LAYERSCAPE=y