Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

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

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 521b1ec..8e0eedc 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -36,6 +36,7 @@ config ARCH_EXYNOS
        select HAVE_S3C_RTC if RTC_CLASS
        select PINCTRL
        select PINCTRL_EXYNOS
+       select SOC_SAMSUNG
        help
          This enables support for ARMv8 based Samsung Exynos SoC family.
 
@@ -44,8 +45,14 @@ config ARCH_LAYERSCAPE
        help
          This enables support for the Freescale Layerscape SoC family.
 
+config ARCH_LG1K
+       bool "LG Electronics LG1K SoC Family"
+       help
+         This enables support for LG Electronics LG1K SoC Family
+
 config ARCH_HISI
        bool "Hisilicon SoC Family"
+       select ARM_TIMER_SP804
        select HISILICON_IRQ_MBIGEN
        help
          This enables support for Hisilicon ARMv8 SoC family
@@ -60,13 +67,15 @@ config ARCH_MEDIATEK
 
 config ARCH_MESON
        bool "Amlogic Platforms"
+       select PINCTRL
+       select PINCTRL_MESON
        help
          This enables support for the Amlogic S905 SoCs.
 
 config ARCH_MVEBU
        bool "Marvell EBU SoC Family"
-       select ARMADA_AP806_CORE_CLK
-       select ARMADA_AP806_RING_CLK
+       select ARMADA_AP806_SYSCON
+       select ARMADA_CP110_SYSCON
        select MVEBU_ODMI
        help
          This enables support for Marvell EBU familly, including: