From a768297701c8ebf185b054234ce2bf3a01b86233 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Sat, 1 Dec 2018 15:17:49 +0000 Subject: MAINTAINERS: Remove myself from the list Kevin is basically doing all the work. Remove my name as co-maintainer. Signed-off-by: Carlo Caione Signed-off-by: Kevin Hilman --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index f4855974f325..b1d8d4c879ee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1296,7 +1296,6 @@ F: include/dt-bindings/clock/gxbb* F: Documentation/devicetree/bindings/clock/amlogic* ARM/Amlogic Meson SoC support -M: Carlo Caione M: Kevin Hilman L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-amlogic@lists.infradead.org -- cgit v1.2.3 From 05d9fcbcf402fa4dd219ffeeb341d1b48d75404c Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Mon, 10 Dec 2018 19:45:54 +0000 Subject: MAINTAINERS: add drivers/soc/amlogic/ to amlogic list While sending a patch for drivers/soc/amlogic/Kconfig, I saw that getmaintainer.pl give nobody for it. This patchs adds drivers/soc/amlogic/ to amlogic maintainers. Signed-off-by: Corentin Labbe Signed-off-by: Kevin Hilman --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index b1d8d4c879ee..9855c34c890d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1306,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 -- cgit v1.2.3 From e9e863dc1dc88212b09d279a143027e1521b35d1 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Fri, 23 Nov 2018 20:53:06 +0100 Subject: ARM: meson: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER The 32-bit Meson SoCs use multiple Cortex-A9 (Meson8 and Meson8m2) or Cortex-A5 (Meson8b) CPU cores. These come with the "ARM global timer" and "Timer-Watchdog" (aka TWD, which provides both a per-cpu local timer and watchdog). Selecting ARM_GLOBAL_TIMER and HAVE_ARM_TWD allows us to add the timers to the SoC.dtsi files. Signed-off-by: Martin Blumenstingl Signed-off-by: Kevin Hilman --- arch/arm/mach-meson/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index d51cfda953d4..b16831697183 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -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 -- cgit v1.2.3