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 --cc drivers/soc/Kconfig
index 309643fe35f9e68eb8e542d5ef48c5d81b904fad,de4fcdbae2a8fa03ef4fc07e4e9f978063a566cc..f8c0286f8a65479f71f17a9b740209479ee2efdd
--- 1/drivers/soc/Kconfig
--- 2/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@@ -1,11 -1,10 +1,12 @@@
  menu "SOC (System On Chip) specific Drivers"
  
 +source "drivers/soc/atmel/Kconfig"
  source "drivers/soc/bcm/Kconfig"
  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 --cc drivers/soc/Makefile
index 824b44281efa5e115b829b345ed0ea5c73af569b,59d8c937f4a8748e20081007198a82979cf18e75..c0b2a610efcd0223305be512af9bc3064b15dd96
--- 1/drivers/soc/Makefile
--- 2/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -7,10 -6,9 +7,10 @@@ obj-y                          += bcm
  obj-$(CONFIG_ARCH_DOVE)               += dove/
  obj-$(CONFIG_MACH_DOVE)               += dove/
  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 --cc drivers/soc/renesas/rcar-sysc.c
Simple merge