clk: ingenic: Add proper Kconfig entries

Previously, the CGU code corresponding to the SoC for which we're
compiling the kernel was the only one enabled, which made it impossible
to build one kernel that supports them all.

Now, it is possible to select more than one SoC to support.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 292056bbb30e91a39d6e0f2d27b41e4f0e907c8c..cd9b1d0cb23b5fd80f629fc34f9769df929ee5a5 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -287,6 +287,7 @@ source "drivers/clk/actions/Kconfig"
 source "drivers/clk/bcm/Kconfig"
 source "drivers/clk/hisilicon/Kconfig"
 source "drivers/clk/imgtec/Kconfig"
+source "drivers/clk/ingenic/Kconfig"
 source "drivers/clk/keystone/Kconfig"
 source "drivers/clk/mediatek/Kconfig"
 source "drivers/clk/meson/Kconfig"

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index a84c5573cabeae1ede83c2e597e8d310bc98d307..b3bdcd1c15c49f54f5df682c381f60dcb1ec7c9e 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -72,7 +72,7 @@ obj-$(CONFIG_H8300)                   += h8300/
 obj-$(CONFIG_ARCH_HISI)                        += hisilicon/
 obj-y                                  += imgtec/
 obj-$(CONFIG_ARCH_MXC)                 += imx/
-obj-$(CONFIG_MACH_INGENIC)             += ingenic/
+obj-y                                  += ingenic/
 obj-$(CONFIG_ARCH_KEYSTONE)            += keystone/
 obj-$(CONFIG_MACH_LOONGSON32)          += loongson1/
 obj-y                                  += mediatek/

diff --git a/drivers/clk/ingenic/Kconfig b/drivers/clk/ingenic/Kconfig
new file mode 100644 (file)
index 0000000..2445437
--- /dev/null
+++ b/drivers/clk/ingenic/Kconfig
@@ -0,0 +1,37 @@
+menu "Ingenic JZ47xx CGU drivers"
+       depends on MIPS
+
+config INGENIC_CGU_COMMON
+       bool
+
+config INGENIC_CGU_JZ4740
+       bool "Ingenic JZ4740 CGU driver"
+       default MACH_JZ4740
+       select INGENIC_CGU_COMMON
+       help
+         Support the clocks provided by the CGU hardware on Ingenic JZ4740
+         and compatible SoCs.
+
+         If building for a JZ4740 SoC, you want to say Y here.
+
+config INGENIC_CGU_JZ4770
+       bool "Ingenic JZ4770 CGU driver"
+       default MACH_JZ4770
+       select INGENIC_CGU_COMMON
+       help
+         Support the clocks provided by the CGU hardware on Ingenic JZ4770
+         and compatible SoCs.
+
+         If building for a JZ4770 SoC, you want to say Y here.
+
+config INGENIC_CGU_JZ4780
+       bool "Ingenic JZ4780 CGU driver"
+       default MACH_JZ4780
+       select INGENIC_CGU_COMMON
+       help
+         Support the clocks provided by the CGU hardware on Ingenic JZ4780
+         and compatible SoCs.
+
+         If building for a JZ4780 SoC, you want to say Y here.
+
+endmenu

diff --git a/drivers/clk/ingenic/Makefile b/drivers/clk/ingenic/Makefile
index 1456e4cdb5622faf68bc7a4f331e433057c5d0f4..8b8dc79c7ce6d30f55291c433df4f14ea6aef058 100644 (file)
--- a/drivers/clk/ingenic/Makefile
+++ b/drivers/clk/ingenic/Makefile
@@ -1,4 +1,4 @@
-obj-y                          += cgu.o
-obj-$(CONFIG_MACH_JZ4740)      += jz4740-cgu.o
-obj-$(CONFIG_MACH_JZ4770)      += jz4770-cgu.o
-obj-$(CONFIG_MACH_JZ4780)      += jz4780-cgu.o
+obj-$(CONFIG_INGENIC_CGU_COMMON)       += cgu.o
+obj-$(CONFIG_INGENIC_CGU_JZ4740)       += jz4740-cgu.o
+obj-$(CONFIG_INGENIC_CGU_JZ4770)       += jz4770-cgu.o
+obj-$(CONFIG_INGENIC_CGU_JZ4780)       += jz4780-cgu.o