Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[linux-2.6-block.git] / arch / arm64 / Kconfig.platforms

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index d4faca775d9c43a28ee2bdbd6d24f64c20de8a11..70498a033cf57408ccdefe374c5fa8e1d22e785d 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -52,6 +52,11 @@ config ARCH_BERLIN
        help
          This enables support for Marvell Berlin SoC Family
 
+config ARCH_BITMAIN
+       bool "Bitmain SoC Platforms"
+       help
+         This enables support for the Bitmain SoC Family.
+
 config ARCH_BRCMSTB
        bool "Broadcom Set-Top-Box SoCs"
        select BRCMSTB_L2_IRQ
@@ -112,12 +117,13 @@ config ARCH_MESON
        bool "Amlogic Platforms"
        select PINCTRL
        select PINCTRL_MESON
-       select COMMON_CLK_AMLOGIC
        select COMMON_CLK_GXBB
        select COMMON_CLK_AXG
+       select COMMON_CLK_G12A
        select MESON_IRQ_GPIO
        help
-         This enables support for the Amlogic S905 SoCs.
+         This enables support for the arm64 based Amlogic SoCs
+         such as the s905, S905X/D, S912, A113X/D or S905X/D2
 
 config ARCH_MVEBU
        bool "Marvell EBU SoC Family"
@@ -146,6 +152,10 @@ config ARCH_MXC
        bool "ARMv8 based NXP i.MX SoC family"
        select ARM64_ERRATUM_843419
        select ARM64_ERRATUM_845719 if COMPAT
+       select IMX_GPCV2
+       select IMX_GPCV2_PM_DOMAINS
+       select PM
+       select PM_GENERIC_DOMAINS
        help
          This enables support for the ARMv8 based SoCs in the
          NXP i.MX family.