Merge tag 'sunxi-defconfig-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel...

Merge "Allwinner defconfig changes for 3.20" from Maxime Ripard:

Defconfig changes for both sunxi and multi_v7 defconfig in order to add the
cpufreq-related drivers and the PMIC drivers.

* tag 'sunxi-defconfig-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Add AXP20x support multi_v7_defconfig
  ARM: sunxi: Add AXP20x support in defconfig
  ARM: multi_v7_defconfig: Enable TOUCHSCREEN_SUN4I, CPU_THERMAL
  ARM: sunxi_defconfig: Enable TOUCHSCREEN_SUN4I, CPUFREQ_DT, CPU_THERMAL

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

diff --cc arch/arm/configs/multi_v7_defconfig
index b8122efb24f3c4644612a75a59c5d1bb5093bad0,65ca0e72882e6760c6b029e190ce13112eac4f28..6e974b6bfa902d3d92f97840629ae73f9120e6c1
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -276,8 -269,8 +278,9 @@@ CONFIG_POWER_RESET_SUN6I=
  CONFIG_SENSORS_LM90=y
  CONFIG_SENSORS_LM95245=y
  CONFIG_THERMAL=y
+ CONFIG_CPU_THERMAL=y
  CONFIG_ARMADA_THERMAL=y
 +CONFIG_DAVINCI_WATCHDOG
  CONFIG_ST_THERMAL_SYSCFG=y
  CONFIG_ST_THERMAL_MEMMAP=y
  CONFIG_WATCHDOG=y