Merge tag 'for-v4.6/gxbb-arm64' of https://github.com/carlocaione/linux-meson into...

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 <olof@lixom.net>

diff --cc arch/arm64/Kconfig.platforms
index c2d621fc7e014316c1510a540d4e2afecee6a28c,c900e1708d18ffbe9e7062a126f5e4e83027efab..9fbc3e6896bf3e2eeb0be26817e2aa6884c1315a
--- 1/arch/arm64/Kconfig.platforms
--- 2/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