From: Olof Johansson Date: Sun, 13 Mar 2016 01:44:51 +0000 (-0800) Subject: Merge tag 'for-v4.6/gxbb-arm64' of https://github.com/carlocaione/linux-meson into... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a86e56cb3910bfe6f842b31cbcfa549af76efafc;p=linux-beck.git Merge tag 'for-v4.6/gxbb-arm64' of https://github.com/carlocaione/linux-meson into next/arm64 Provide the ARCH_MESON Kconfig symbol for the Amlogic S905 SoCs. * tag 'for-v4.6/gxbb-arm64' of https://github.com/carlocaione/linux-meson: ARM64: Enable Amlogic Meson GXBaby platform Signed-off-by: Olof Johansson --- a86e56cb3910bfe6f842b31cbcfa549af76efafc diff --cc arch/arm64/Kconfig.platforms index c2d621fc7e01,c900e1708d18..9fbc3e6896bf --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@@ -56,17 -48,11 +56,22 @@@ config ARCH_MEDIATE help Support for Mediatek MT65xx & MT81xx ARMv8 SoCs + config ARCH_MESON + bool "Amlogic Platforms" + 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 MVEBU_ODMI + help + This enables support for Marvell EBU familly, including: + - Armada 3700 SoC Family + - Armada 7K SoC Family + - Armada 8K SoC Family + config ARCH_QCOM bool "Qualcomm Platforms" select PINCTRL