From: Olof Johansson Date: Tue, 27 Jan 2015 04:23:02 +0000 (-0800) Subject: Merge tag 'sunxi-defconfig-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v4.0-rc1~67^2~4 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1d8cedf9b2477ca0b80eea933ca8101ae7064c59;p=linux-block.git Merge tag 'sunxi-defconfig-for-3.20' of https://git./linux/kernel/git/mripard/linux into next/defconfig 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 --- 1d8cedf9b2477ca0b80eea933ca8101ae7064c59 diff --cc arch/arm/configs/multi_v7_defconfig index b8122efb24f3,65ca0e72882e..6e974b6bfa90 --- a/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