Merge tag 'amlogic-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorOlof Johansson <olof@lixom.net>
Wed, 12 Dec 2018 22:03:48 +0000 (14:03 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 12 Dec 2018 22:03:48 +0000 (14:03 -0800)
soc: Amlogic updates for v4.21
- ARM: meson: Kconfig: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER
- misc MAINTAINERS updates

* tag 'amlogic-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: meson: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER
  MAINTAINERS: add drivers/soc/amlogic/ to amlogic list
  MAINTAINERS: Remove myself from the list

Signed-off-by: Olof Johansson <olof@lixom.net>
MAINTAINERS
arch/arm/mach-meson/Kconfig

index 0abecc528daca1cdaa564b36974c89b70229481f..eb00d8ac74583638e77759f6edea8bc3f35feb7e 100644 (file)
@@ -1296,7 +1296,6 @@ F:        include/dt-bindings/clock/gxbb*
 F:     Documentation/devicetree/bindings/clock/amlogic*
 
 ARM/Amlogic Meson SoC support
-M:     Carlo Caione <carlo@caione.org>
 M:     Kevin Hilman <khilman@baylibre.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-amlogic@lists.infradead.org
@@ -1307,6 +1306,7 @@ F:        arch/arm/boot/dts/meson*
 F:     arch/arm64/boot/dts/amlogic/
 F:     drivers/pinctrl/meson/
 F:     drivers/mmc/host/meson*
+F:     drivers/soc/amlogic/
 N:     meson
 
 ARM/Annapurna Labs ALPINE ARCHITECTURE
index d51cfda953d4564d372dac3955aedc9b3cefef29..b168316971836c525d46721bedeb916ddb3ffa2e 100644 (file)
@@ -4,12 +4,14 @@ menuconfig ARCH_MESON
        select GPIOLIB
        select GENERIC_IRQ_CHIP
        select ARM_GIC
+       select ARM_GLOBAL_TIMER
        select CACHE_L2X0
        select PINCTRL
        select PINCTRL_MESON
        select COMMON_CLK
        select COMMON_CLK_AMLOGIC
        select HAVE_ARM_SCU if SMP
+       select HAVE_ARM_TWD if SMP
 
 if ARCH_MESON