From 1468841f834dc969937e6cf7c364698e694ead4a Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 28 Jan 2019 19:22:51 +0100 Subject: [PATCH 1/3] arm64: meson: remove COMMON_CLK_AMLOGIC selection Selecting COMMON_CLK_AMLOGIC is not required as it is already selected by the SoC clock controller driver Signed-off-by: Jerome Brunet Signed-off-by: Kevin Hilman --- arch/arm64/Kconfig.platforms | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 251ecf34cb02..819e74ae9224 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -112,7 +112,6 @@ config ARCH_MESON bool "Amlogic Platforms" select PINCTRL select PINCTRL_MESON - select COMMON_CLK_AMLOGIC select COMMON_CLK_GXBB select COMMON_CLK_AXG select MESON_IRQ_GPIO From 57bf684f1590466a803332e5bf280c69c20cd3da Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 28 Jan 2019 19:22:52 +0100 Subject: [PATCH 2/3] ARM: meson: remove COMMON_CLK_AMLOGIC selection Selecting COMMON_CLK_AMLOGIC is not required as it is already selected by the SoC clock controller driver Signed-off-by: Jerome Brunet Signed-off-by: Kevin Hilman --- arch/arm/mach-meson/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index b16831697183..15e9cb75738e 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -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 From b3077ffcfa24b05c05af3b990d97a392ef88b22e Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Fri, 8 Feb 2019 11:14:04 +0100 Subject: [PATCH 3/3] arm64: meson: enable g12a clock controller Enable the g12a clock controller for ARCH_MESON Signed-off-by: Jerome Brunet Signed-off-by: Kevin Hilman --- arch/arm64/Kconfig.platforms | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 819e74ae9224..d0e0bd4af05d 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -114,9 +114,11 @@ config ARCH_MESON select PINCTRL_MESON 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"