From: Olof Johansson <olof@lixom.net>
Date: Tue, 22 Dec 2015 19:48:45 +0000 (-0800)
Subject: Merge tag 'renesas-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4f3ab84156c37ded3423fa108fbcb101c778e86b;p=linux-beck.git

Merge tag 'renesas-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Renesas ARM Based SoC Defconfig Updates for v4.5

* multi_v7_defconfig and shmobile_defconfig:
  - Enable frame buffer console for armadillo800eva
  - Enable missing Renesas ARM support based on DTSes
  - Drop useless CONFIG_USB_RCAR_PHY=y
* shmobile_defconfig only:
  - Enable CONFIG_PRINTK_TIME

* tag 'renesas-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: Enable frame buffer console for armadillo800eva
  ARM: multi_v7_defconfig: Enable missing Renesas ARM support based on DTSes
  ARM: multi_v7_defconfig: Drop useless CONFIG_USB_RCAR_PHY=y
  ARM: shmobile: defconfig: Enable frame buffer console for armadillo800eva
  ARM: shmobile: defconfig: Enable missing support based on DTSes
  ARM: shmobile: defconfig: Drop useless CONFIG_USB_RCAR_PHY=y
  ARM: shmobile: defconfig: Enable CONFIG_PRINTK_TIME

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

Conflicts:
	arch/arm/configs/multi_v7_defconfig
---

4f3ab84156c37ded3423fa108fbcb101c778e86b
diff --cc arch/arm/configs/multi_v7_defconfig
index 6e6357645d5f,31be07178cc6..b0d9029beeb5
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -313,9 -305,9 +314,10 @@@ CONFIG_I2C_AT91=
  CONFIG_I2C_CADENCE=y
  CONFIG_I2C_DESIGNWARE_PLATFORM=y
  CONFIG_I2C_DIGICOLOR=m
+ CONFIG_I2C_EMEV2=m
  CONFIG_I2C_GPIO=m
  CONFIG_I2C_EXYNOS5=y
 +CONFIG_I2C_IMX=m
  CONFIG_I2C_MV64XXX=y
  CONFIG_I2C_RIIC=y
  CONFIG_I2C_RK3X=y
@@@ -419,11 -400,10 +422,12 @@@ CONFIG_MFD_AS3722=
  CONFIG_MFD_ATMEL_FLEXCOM=y
  CONFIG_MFD_BCM590XX=y
  CONFIG_MFD_AXP20X=y
 -CONFIG_MFD_CROS_EC=y
 +CONFIG_MFD_AXP20X_I2C=m
 +CONFIG_MFD_AXP20X_RSB=m
 +CONFIG_MFD_CROS_EC=m
  CONFIG_MFD_CROS_EC_I2C=m
 -CONFIG_MFD_CROS_EC_SPI=y
 +CONFIG_MFD_CROS_EC_SPI=m
+ CONFIG_MFD_DA9063=m
  CONFIG_MFD_MAX14577=y
  CONFIG_MFD_MAX77686=y
  CONFIG_MFD_MAX77693=y
@@@ -693,15 -658,12 +699,16 @@@ CONFIG_NVEC_POWER=
  CONFIG_NVEC_PAZ00=y
  CONFIG_QCOM_GSBI=y
  CONFIG_QCOM_PM=y
 +CONFIG_QCOM_SMEM=y
  CONFIG_QCOM_SMD=y
  CONFIG_QCOM_SMD_RPM=y
 -CONFIG_QCOM_SMEM=y
 +CONFIG_QCOM_SMP2P=y
 +CONFIG_QCOM_SMSM=y
 +CONFIG_QCOM_WCNSS_CTRL=m
 +CONFIG_ROCKCHIP_PM_DOMAINS=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_CHROME_PLATFORMS=y
+ CONFIG_STAGING_BOARD=y
  CONFIG_CROS_EC_CHARDEV=m
  CONFIG_COMMON_CLK_MAX77686=y
  CONFIG_COMMON_CLK_MAX77802=m