soc: renesas: Rework Kconfig and Makefile logic

[mirror_ubuntu-artful-kernel.git] / drivers / soc / renesas / Makefile

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index d9115cb5ed9dae787c0bc22d43e9425f3ceef78a..1a1a297b26a796133977f2f6c99b9b5febdffa83 100644 (file)
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -1,18 +1,17 @@
-obj-$(CONFIG_SOC_BUS)          += renesas-soc.o
+# Generic, must be first because of soc_device_register()
+obj-$(CONFIG_SOC_RENESAS)      += renesas-soc.o
 
-obj-$(CONFIG_ARCH_RCAR_GEN1)   += rcar-rst.o
-obj-$(CONFIG_ARCH_RCAR_GEN2)   += rcar-rst.o
-obj-$(CONFIG_ARCH_R8A7795)     += rcar-rst.o
-obj-$(CONFIG_ARCH_R8A7796)     += rcar-rst.o
+# SoC
+obj-$(CONFIG_SYSC_R8A7743)     += r8a7743-sysc.o
+obj-$(CONFIG_SYSC_R8A7745)     += r8a7745-sysc.o
+obj-$(CONFIG_SYSC_R8A7779)     += r8a7779-sysc.o
+obj-$(CONFIG_SYSC_R8A7790)     += r8a7790-sysc.o
+obj-$(CONFIG_SYSC_R8A7791)     += r8a7791-sysc.o
+obj-$(CONFIG_SYSC_R8A7792)     += r8a7792-sysc.o
+obj-$(CONFIG_SYSC_R8A7794)     += r8a7794-sysc.o
+obj-$(CONFIG_SYSC_R8A7795)     += r8a7795-sysc.o
+obj-$(CONFIG_SYSC_R8A7796)     += r8a7796-sysc.o
 
-obj-$(CONFIG_ARCH_R8A7743)     += rcar-sysc.o r8a7743-sysc.o
-obj-$(CONFIG_ARCH_R8A7745)     += rcar-sysc.o r8a7745-sysc.o
-obj-$(CONFIG_ARCH_R8A7779)     += rcar-sysc.o r8a7779-sysc.o
-obj-$(CONFIG_ARCH_R8A7790)     += rcar-sysc.o r8a7790-sysc.o
-obj-$(CONFIG_ARCH_R8A7791)     += rcar-sysc.o r8a7791-sysc.o
-obj-$(CONFIG_ARCH_R8A7792)     += rcar-sysc.o r8a7792-sysc.o
-# R-Car M2-N is identical to R-Car M2-W w.r.t. power domains.
-obj-$(CONFIG_ARCH_R8A7793)     += rcar-sysc.o r8a7791-sysc.o
-obj-$(CONFIG_ARCH_R8A7794)     += rcar-sysc.o r8a7794-sysc.o
-obj-$(CONFIG_ARCH_R8A7795)     += rcar-sysc.o r8a7795-sysc.o
-obj-$(CONFIG_ARCH_R8A7796)     += rcar-sysc.o r8a7796-sysc.o
+# Family
+obj-$(CONFIG_RST_RCAR)         += rcar-rst.o
+obj-$(CONFIG_SYSC_RCAR)                += rcar-sysc.o