clk: meson: only build selected platforms

Break the AmLogic clock code up so that only the necessary parts are
compiled and linked. The core code is selected by both arm and arm64
builds with COMMON_CLK_AMLOGIC. The individual drivers have their own
config options as well.

Tested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 53ddba26578ce341eb3f488001a9cc267342eeda..30feb6b40305df9c84a73c723b9d1fe03725304d 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -208,6 +208,7 @@ config COMMON_CLK_OXNAS
 
 source "drivers/clk/bcm/Kconfig"
 source "drivers/clk/hisilicon/Kconfig"
+source "drivers/clk/meson/Kconfig"
 source "drivers/clk/mvebu/Kconfig"
 source "drivers/clk/qcom/Kconfig"
 source "drivers/clk/renesas/Kconfig"

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index dcc5e698ff6dd4d61255dd274dafadb1af239161..af03eb2f6c05a37e7bcdebb0da796d6ea506ba56 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -65,7 +65,7 @@ ifeq ($(CONFIG_COMMON_CLK), y)
 obj-$(CONFIG_ARCH_MMP)                 += mmp/
 endif
 obj-y                                  += mvebu/
-obj-$(CONFIG_ARCH_MESON)               += meson/
+obj-$(CONFIG_COMMON_CLK_AMLOGIC)       += meson/
 obj-$(CONFIG_ARCH_MXS)                 += mxs/
 obj-$(CONFIG_MACH_PISTACHIO)           += pistachio/
 obj-$(CONFIG_COMMON_CLK_NXP)           += nxp/

diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig
new file mode 100644 (file)
index 0000000..7bb19ad
--- /dev/null
+++ b/drivers/clk/meson/Kconfig
@@ -0,0 +1,12 @@
+config COMMON_CLK_AMLOGIC
+       bool
+       depends on OF
+       depends on ARCH_MESON || COMPILE_TEST
+
+config COMMON_CLK_MESON8B
+       bool
+       depends on COMMON_CLK_AMLOGIC
+       help
+         Support for the clock controller on AmLogic S805 devices, aka
+         meson8b. Say Y if you want peripherals and CPU frequency scaling to
+         work.

diff --git a/drivers/clk/meson/Makefile b/drivers/clk/meson/Makefile
index 901b5d435812167b461ad599616e41270323fe54..b3d60fecd8461ea4f80cccbfa45ac6774f8fb2c8 100644 (file)
--- a/drivers/clk/meson/Makefile
+++ b/drivers/clk/meson/Makefile
@@ -2,5 +2,5 @@
 # Makefile for Meson specific clk
 #
 
-obj-y += clk-pll.o clk-cpu.o
-obj-y += meson8b-clkc.o
+obj-$(CONFIG_COMMON_CLK_AMLOGIC) += clk-pll.o clk-cpu.o
+obj-$(CONFIG_COMMON_CLK_MESON8B) += meson8b-clkc.o