Merge tag 'renesas-drivers-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel...

Renesas ARM Based SoC Drivers Updates for v4.13

* Rework Kconfig and Makefile logic

* tag 'renesas-drivers-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  soc: renesas: Rework Kconfig and Makefile logic

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index 309643f..f8c0286 100644 (file)
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -6,6 +6,7 @@ source "drivers/soc/fsl/Kconfig"
 source "drivers/soc/imx/Kconfig"
 source "drivers/soc/mediatek/Kconfig"
 source "drivers/soc/qcom/Kconfig"
+source "drivers/soc/renesas/Kconfig"
 source "drivers/soc/rockchip/Kconfig"
 source "drivers/soc/samsung/Kconfig"
 source "drivers/soc/sunxi/Kconfig"

diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 824b442..c0b2a61 100644 (file)
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -10,7 +10,7 @@ obj-y                         += fsl/
 obj-$(CONFIG_ARCH_MXC)         += imx/
 obj-$(CONFIG_ARCH_MEDIATEK)    += mediatek/
 obj-$(CONFIG_ARCH_QCOM)                += qcom/
-obj-$(CONFIG_ARCH_RENESAS)     += renesas/
+obj-y                          += renesas/
 obj-$(CONFIG_ARCH_ROCKCHIP)    += rockchip/
 obj-$(CONFIG_SOC_SAMSUNG)      += samsung/
 obj-$(CONFIG_ARCH_SUNXI)       += sunxi/

diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
new file mode 100644 (file)
index 0000000..87a4be4
--- /dev/null
+++ b/drivers/soc/renesas/Kconfig
@@ -0,0 +1,63 @@
+config SOC_RENESAS
+       bool "Renesas SoC driver support" if COMPILE_TEST && !ARCH_RENESAS
+       default y if ARCH_RENESAS
+       select SOC_BUS
+       select RST_RCAR if ARCH_RCAR_GEN1 || ARCH_RCAR_GEN2 || \
+                          ARCH_R8A7795 || ARCH_R8A7796
+       select SYSC_R8A7743 if ARCH_R8A7743
+       select SYSC_R8A7745 if ARCH_R8A7745
+       select SYSC_R8A7779 if ARCH_R8A7779
+       select SYSC_R8A7790 if ARCH_R8A7790
+       select SYSC_R8A7791 if ARCH_R8A7791 || ARCH_R8A7793
+       select SYSC_R8A7792 if ARCH_R8A7792
+       select SYSC_R8A7794 if ARCH_R8A7794
+       select SYSC_R8A7795 if ARCH_R8A7795
+       select SYSC_R8A7796 if ARCH_R8A7796
+
+if SOC_RENESAS
+
+# SoC
+config SYSC_R8A7743
+       bool "RZ/G1M System Controller support" if COMPILE_TEST
+       select SYSC_RCAR
+
+config SYSC_R8A7745
+       bool "RZ/G1E System Controller support" if COMPILE_TEST
+       select SYSC_RCAR
+
+config SYSC_R8A7779
+       bool "R-Car H1 System Controller support" if COMPILE_TEST
+       select SYSC_RCAR
+
+config SYSC_R8A7790
+       bool "R-Car H2 System Controller support" if COMPILE_TEST
+       select SYSC_RCAR
+
+config SYSC_R8A7791
+       bool "R-Car M2-W/N System Controller support" if COMPILE_TEST
+       select SYSC_RCAR
+
+config SYSC_R8A7792
+       bool "R-Car V2H System Controller support" if COMPILE_TEST
+       select SYSC_RCAR
+
+config SYSC_R8A7794
+       bool "R-Car E2 System Controller support" if COMPILE_TEST
+       select SYSC_RCAR
+
+config SYSC_R8A7795
+       bool "R-Car H3 System Controller support" if COMPILE_TEST
+       select SYSC_RCAR
+
+config SYSC_R8A7796
+       bool "R-Car M3-W System Controller support" if COMPILE_TEST
+       select SYSC_RCAR
+
+# Family
+config RST_RCAR
+       bool "R-Car Reset Controller support" if COMPILE_TEST
+
+config SYSC_RCAR
+       bool "R-Car System Controller support" if COMPILE_TEST
+
+endif # SOC_RENESAS

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index d9115cb..1a1a297 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

diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 528a137..dcad5c4 100644 (file)
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -275,35 +275,33 @@ finalize:
 }
 
 static const struct of_device_id rcar_sysc_matches[] = {
-#ifdef CONFIG_ARCH_R8A7743
+#ifdef CONFIG_SYSC_R8A7743
        { .compatible = "renesas,r8a7743-sysc", .data = &r8a7743_sysc_info },
 #endif
-#ifdef CONFIG_ARCH_R8A7745
+#ifdef CONFIG_SYSC_R8A7745
        { .compatible = "renesas,r8a7745-sysc", .data = &r8a7745_sysc_info },
 #endif
-#ifdef CONFIG_ARCH_R8A7779
+#ifdef CONFIG_SYSC_R8A7779
        { .compatible = "renesas,r8a7779-sysc", .data = &r8a7779_sysc_info },
 #endif
-#ifdef CONFIG_ARCH_R8A7790
+#ifdef CONFIG_SYSC_R8A7790
        { .compatible = "renesas,r8a7790-sysc", .data = &r8a7790_sysc_info },
 #endif
-#ifdef CONFIG_ARCH_R8A7791
+#ifdef CONFIG_SYSC_R8A7791
        { .compatible = "renesas,r8a7791-sysc", .data = &r8a7791_sysc_info },
-#endif
-#ifdef CONFIG_ARCH_R8A7792
-       { .compatible = "renesas,r8a7792-sysc", .data = &r8a7792_sysc_info },
-#endif
-#ifdef CONFIG_ARCH_R8A7793
        /* R-Car M2-N is identical to R-Car M2-W w.r.t. power domains. */
        { .compatible = "renesas,r8a7793-sysc", .data = &r8a7791_sysc_info },
 #endif
-#ifdef CONFIG_ARCH_R8A7794
+#ifdef CONFIG_SYSC_R8A7792
+       { .compatible = "renesas,r8a7792-sysc", .data = &r8a7792_sysc_info },
+#endif
+#ifdef CONFIG_SYSC_R8A7794
        { .compatible = "renesas,r8a7794-sysc", .data = &r8a7794_sysc_info },
 #endif
-#ifdef CONFIG_ARCH_R8A7795
+#ifdef CONFIG_SYSC_R8A7795
        { .compatible = "renesas,r8a7795-sysc", .data = &r8a7795_sysc_info },
 #endif
-#ifdef CONFIG_ARCH_R8A7796
+#ifdef CONFIG_SYSC_R8A7796
        { .compatible = "renesas,r8a7796-sysc", .data = &r8a7796_sysc_info },
 #endif
        { /* sentinel */ }

diff --git a/include/linux/soc/renesas/rcar-rst.h b/include/linux/soc/renesas/rcar-rst.h
index 787e7ad..2c231f2 100644 (file)
--- a/include/linux/soc/renesas/rcar-rst.h
+++ b/include/linux/soc/renesas/rcar-rst.h
@@ -1,8 +1,7 @@
 #ifndef __LINUX_SOC_RENESAS_RCAR_RST_H__
 #define __LINUX_SOC_RENESAS_RCAR_RST_H__
 
-#if defined(CONFIG_ARCH_RCAR_GEN1) || defined(CONFIG_ARCH_RCAR_GEN2) || \
-    defined(CONFIG_ARCH_R8A7795) || defined(CONFIG_ARCH_R8A7796)
+#ifdef CONFIG_RST_RCAR
 int rcar_rst_read_mode_pins(u32 *mode);
 #else
 static inline int rcar_rst_read_mode_pins(u32 *mode) { return -ENODEV; }