Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[linux.git] / arch / arm64 / Kconfig.platforms

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index d5aeac351fc3a776ee840f09680f43a864b5307c..393d2b524284e79ab4a344779089432eb4ef31bd 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -71,6 +71,13 @@ config ARCH_EXYNOS
        help
          This enables support for ARMv8 based Samsung Exynos SoC family.
 
+config ARCH_K3
+       bool "Texas Instruments Inc. K3 multicore SoC architecture"
+       select PM_GENERIC_DOMAINS if PM
+       help
+         This enables support for Texas Instruments' K3 multicore SoC
+         architecture.
+
 config ARCH_LAYERSCAPE
        bool "ARMv8 based Freescale Layerscape SoC family"
        select EDAC_SUPPORT
@@ -151,6 +158,7 @@ config ARCH_ROCKCHIP
        select GPIOLIB
        select PINCTRL
        select PINCTRL_ROCKCHIP
+       select PM
        select ROCKCHIP_TIMER
        help
          This enables support for the ARMv8 based Rockchip chipsets,
@@ -261,6 +269,7 @@ config ARCH_UNIPHIER
        bool "Socionext UniPhier SoC Family"
        select ARCH_HAS_RESET_CONTROLLER
        select PINCTRL
+       select RESET_CONTROLLER
        help
          This enables support for Socionext UniPhier SoC family.