clk: shmobile: Rework CONFIG_ARCH_SHMOBILE_MULTI

Shmobile is all multiplatform these days, so get rid of the reference to
CONFIG_ARCH_SHMOBILE_MULTI in drivers/clk/shmobile/.

Also instead of always enabling DIV6 and MSTP adjust the Makefile
to enable DIV6 and MSTP depending on if they are included in the
SoC or not.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/drivers/clk/shmobile/Makefile b/drivers/clk/shmobile/Makefile
index 97c71c885e4f38c5714971818f0fb8d700e7a984..1eb947db6f5926a0e1682ead338650cd443817e5 100644 (file)
--- a/drivers/clk/shmobile/Makefile
+++ b/drivers/clk/shmobile/Makefile
@@ -1,13 +1,11 @@
 obj-$(CONFIG_ARCH_EMEV2)               += clk-emev2.o
-obj-$(CONFIG_ARCH_R7S72100)            += clk-rz.o
-obj-$(CONFIG_ARCH_R8A73A4)             += clk-r8a73a4.o
-obj-$(CONFIG_ARCH_R8A7740)             += clk-r8a7740.o
-obj-$(CONFIG_ARCH_R8A7778)             += clk-r8a7778.o
-obj-$(CONFIG_ARCH_R8A7779)             += clk-r8a7779.o
-obj-$(CONFIG_ARCH_R8A7790)             += clk-rcar-gen2.o
-obj-$(CONFIG_ARCH_R8A7791)             += clk-rcar-gen2.o
-obj-$(CONFIG_ARCH_R8A7793)             += clk-rcar-gen2.o
-obj-$(CONFIG_ARCH_R8A7794)             += clk-rcar-gen2.o
-obj-$(CONFIG_ARCH_SH73A0)              += clk-sh73a0.o
-obj-$(CONFIG_ARCH_SHMOBILE_MULTI)      += clk-div6.o
-obj-$(CONFIG_ARCH_SHMOBILE_MULTI)      += clk-mstp.o
+obj-$(CONFIG_ARCH_R7S72100)            += clk-rz.o clk-mstp.o
+obj-$(CONFIG_ARCH_R8A73A4)             += clk-r8a73a4.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_R8A7740)             += clk-r8a7740.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_R8A7778)             += clk-r8a7778.o clk-mstp.o
+obj-$(CONFIG_ARCH_R8A7779)             += clk-r8a7779.o clk-mstp.o
+obj-$(CONFIG_ARCH_R8A7790)             += clk-rcar-gen2.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_R8A7791)             += clk-rcar-gen2.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_R8A7793)             += clk-rcar-gen2.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_R8A7794)             += clk-rcar-gen2.o clk-mstp.o clk-div6.o
+obj-$(CONFIG_ARCH_SH73A0)              += clk-sh73a0.o clk-mstp.o clk-div6.o