openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

soc: Amlogic updates for v4.21 

- ARM: meson: Kconfig: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER
 - misc MAINTAINERS updates
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAlwO0GIACgkQWTcYmtP7
 xmVr4g//YasQSw63JB99jqXacfg2D6ptc0knQ9GMzPyLZd4ORjjQ3g5tR+cNzNFy
 pPzSjKDS3+lqiPS8P1LBcRc0jUzqtGoYZfZCbY5xgTsEW+VlBnnkn7Sq6k0e+CGq
 kq5y4lacyzwxfjqOzRPk5mZ+3kB94IocUyYoA/5Q/2wotYvetHQmS/Tphy1jzKXA
 q9HYrM5y1fn3jJZ8h1z1m5Aq5D/CIDIS+b6rdUOGrFk5AmcbULdPeTDY8rR6qzKC
 Rfm1mkX0ujn9KePvGvHmbrapN32W9VHyacM86+XH2LnIi/OZTqWSTRdQYiZrrpnH
 x/J/lAhfbqE2DyA7/Y9uvBdZieUEoQEzAKTwqrhll3YUkXDoJiKyptntRHI+nX2z
 gZmjAwYpX7iaH7cXJ4fQyT5ZazJvUQiNgdkzZ4XheHhq+cAvtecm90yClpC6hxVK
 KCI93M+TXylscHNlKlnKvdyjRHjlo7QeyV1hxkKPnIrhAReefQp7hfpKWMomMJty
 QrX044bKAhM2iIwq4saSqN9tJHK4rrcclWTPk4Q9RZCW5AV1S0dx4pfaZ9AHMiEK
 9r7cADRjoc0FfKWDswM9d5rLchK8iJhpaQMzW6fg0edxMaCZTj/InOdUzdzAG+J2
 aPZcTgpAxA6zVWPCT2SKJFZfvh4egoPBZj+y5aDnrlQb+P8W0OQ=
 =fEUd
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-12-12 14:03:48 -08:00
parent 4238973b2e e9e863dc1d
commit 6dc7e8764b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -1296,7 +1296,6 @@ F: include/dt-bindings/clock/gxbb*
F: Documentation/devicetree/bindings/clock/amlogic* F: Documentation/devicetree/bindings/clock/amlogic*
ARM/Amlogic Meson SoC support ARM/Amlogic Meson SoC support
M: Carlo Caione <carlo@caione.org>
M: Kevin Hilman <khilman@baylibre.com> M: Kevin Hilman <khilman@baylibre.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-amlogic@lists.infradead.org L: linux-amlogic@lists.infradead.org
@ -1307,6 +1306,7 @@ F: arch/arm/boot/dts/meson*
F: arch/arm64/boot/dts/amlogic/ F: arch/arm64/boot/dts/amlogic/
F: drivers/pinctrl/meson/ F: drivers/pinctrl/meson/
F: drivers/mmc/host/meson* F: drivers/mmc/host/meson*
F: drivers/soc/amlogic/
N: meson N: meson
ARM/Annapurna Labs ALPINE ARCHITECTURE ARM/Annapurna Labs ALPINE ARCHITECTURE

2
arch/arm/mach-meson/Kconfig
View File

@ -4,12 +4,14 @@ menuconfig ARCH_MESON
select GPIOLIB select GPIOLIB
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select ARM_GIC select ARM_GIC
select ARM_GLOBAL_TIMER
select CACHE_L2X0 select CACHE_L2X0
select PINCTRL select PINCTRL
select PINCTRL_MESON select PINCTRL_MESON
select COMMON_CLK select COMMON_CLK
select COMMON_CLK_AMLOGIC select COMMON_CLK_AMLOGIC
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
if ARCH_MESON if ARCH_MESON