Commit 6dc7e876 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-soc' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents 4238973b e9e863dc

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-meson/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE