Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfe9930e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-soc' of... 

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

Amlogic SoC Kconfig updates for v5.1:
- arm64: meson: enable g12a clock controller
- drop unneeded COMMON_CLK_AMLOGIC

* tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  arm64: meson: enable g12a clock controller
  ARM: meson: remove COMMON_CLK_AMLOGIC selection
  arm64: meson: remove COMMON_CLK_AMLOGIC selection

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b8961b1e b3077ffc

arch/arm/mach-meson/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ menuconfig ARCH_MESON 
	select PINCTRL

	select PINCTRL_MESON

	select COMMON_CLK

	select COMMON_CLK_AMLOGIC

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

arch/arm64/Kconfig.platforms

+3 −2
Original line number Diff line number Diff line
@@ -112,12 +112,13 @@ config ARCH_MESON 
	bool "Amlogic Platforms"

	select PINCTRL

	select PINCTRL_MESON

	select COMMON_CLK_AMLOGIC

	select COMMON_CLK_GXBB

	select COMMON_CLK_AXG

	select COMMON_CLK_G12A

	select MESON_IRQ_GPIO

	help

	  This enables support for the Amlogic S905 SoCs.

	  This enables support for the arm64 based Amlogic SoCs

	  such as the s905, S905X/D, S912, A113X/D or S905X/D2



config ARCH_MVEBU

	bool "Marvell EBU SoC Family"