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 --combined 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
@@@ -32,7 -32,6 +32,7 @@@ CONFIG_ARCH_HIGHBANK=
  CONFIG_ARCH_HISI=y
  CONFIG_ARCH_HI3xxx=y
  CONFIG_ARCH_HIX5HD2=y
 +CONFIG_ARCH_HIP01=y
  CONFIG_ARCH_HIP04=y
  CONFIG_ARCH_KEYSTONE=y
  CONFIG_ARCH_MESON=y
@@@ -79,7 -78,6 +79,7 @@@ CONFIG_ARCH_WM8850=
  CONFIG_ARCH_ZYNQ=y
  CONFIG_TRUSTED_FOUNDATIONS=y
  CONFIG_PCI=y
 +CONFIG_PCI_KEYSTONE=y
  CONFIG_PCI_MSI=y
  CONFIG_PCI_MVEBU=y
  CONFIG_PCI_TEGRA=y
@@@ -134,7 -132,6 +134,7 @@@ CONFIG_MTD_CMDLINE_PARTS=
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_M25P80=y
  CONFIG_MTD_NAND=y
 +CONFIG_MTD_NAND_DAVINCI=y
  CONFIG_MTD_SPI_NOR=y
  CONFIG_MTD_UBI=y
  CONFIG_BLK_DEV_LOOP=y
@@@ -192,13 -189,14 +192,15 @@@ CONFIG_MOUSE_PS2_ELANTECH=
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ATMEL_MXT=y
  CONFIG_TOUCHSCREEN_STMPE=y
+ CONFIG_TOUCHSCREEN_SUN4I=y
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_MPU3050=y
+ CONFIG_INPUT_AXP20X_PEK=y
  CONFIG_SERIO_AMBAKMI=y
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
  CONFIG_SERIAL_8250_DW=y
 +CONFIG_SERIAL_8250_MT6577=y
  CONFIG_SERIAL_AMBA_PL011=y
  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
  CONFIG_SERIAL_MESON=y
@@@ -224,7 -222,6 +226,7 @@@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=
  CONFIG_SERIAL_ST_ASC=y
  CONFIG_SERIAL_ST_ASC_CONSOLE=y
  CONFIG_I2C_CHARDEV=y
 +CONFIG_I2C_DAVINCI=y
  CONFIG_I2C_MUX=y
  CONFIG_I2C_MUX_PCA954x=y
  CONFIG_I2C_MUX_PINCTRL=y
@@@ -238,7 -235,6 +240,7 @@@ CONFIG_I2C_TEGRA=
  CONFIG_I2C_ST=y
  CONFIG_SPI=y
  CONFIG_I2C_XILINX=y
 +CONFIG_SPI_DAVINCI=y
  CONFIG_SPI_CADENCE=y
  CONFIG_SPI_OMAP24XX=y
  CONFIG_SPI_ORION=y
@@@ -257,27 -253,24 +259,28 @@@ CONFIG_PINCTRL_APQ8084=
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_GENERIC_PLATFORM=y
  CONFIG_GPIO_DWAPB=y
 +CONFIG_GPIO_DAVINCI=y
  CONFIG_GPIO_XILINX=y
  CONFIG_GPIO_ZYNQ=y
  CONFIG_GPIO_PCA953X=y
  CONFIG_GPIO_PCA953X_IRQ=y
  CONFIG_GPIO_TWL4030=y
  CONFIG_GPIO_PALMAS=y
 +CONFIG_GPIO_SYSCON=y
  CONFIG_GPIO_TPS6586X=y
  CONFIG_GPIO_TPS65910=y
  CONFIG_BATTERY_SBS=y
  CONFIG_CHARGER_TPS65090=y
  CONFIG_POWER_RESET_AS3722=y
  CONFIG_POWER_RESET_GPIO=y
 +CONFIG_POWER_RESET_KEYSTONE=y
  CONFIG_POWER_RESET_SUN6I=y
  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
@@@ -288,6 -281,7 +291,7 @@@ CONFIG_SUNXI_WATCHDOG=
  CONFIG_MESON_WATCHDOG=y
  CONFIG_MFD_AS3722=y
  CONFIG_MFD_BCM590XX=y
+ CONFIG_MFD_AXP20X=y
  CONFIG_MFD_CROS_EC=y
  CONFIG_MFD_CROS_EC_SPI=y
  CONFIG_MFD_MAX77686=y
@@@ -300,6 -294,7 +304,7 @@@ CONFIG_MFD_TPS6586X=
  CONFIG_MFD_TPS65910=y
  CONFIG_REGULATOR_AB8500=y
  CONFIG_REGULATOR_AS3722=y
+ CONFIG_REGULATOR_AXP20X=y
  CONFIG_REGULATOR_BCM590XX=y
  CONFIG_REGULATOR_GPIO=y
  CONFIG_MFD_SYSCON=y
@@@ -348,7 -343,6 +353,7 @@@ CONFIG_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_MVEBU=y
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_EHCI_EXYNOS=y
  CONFIG_USB_EHCI_TEGRA=y
  CONFIG_USB_EHCI_HCD_STI=y
  CONFIG_USB_EHCI_HCD_PLATFORM=y
@@@ -357,11 -351,9 +362,11 @@@ CONFIG_USB_OHCI_HCD=
  CONFIG_USB_OHCI_HCD_STI=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y
  CONFIG_USB_STORAGE=y
 +CONFIG_USB_DWC3=y
  CONFIG_USB_CHIPIDEA=y
  CONFIG_USB_CHIPIDEA_HOST=y
  CONFIG_AB8500_USB=y
 +CONFIG_KEYSTONE_USB_PHY=y
  CONFIG_OMAP_USB3=y
  CONFIG_SAMSUNG_USB2PHY=y
  CONFIG_SAMSUNG_USB3PHY=y
@@@ -457,7 -449,6 +462,7 @@@ CONFIG_MSM_MMCC_8974=
  CONFIG_TEGRA_IOMMU_GART=y
  CONFIG_TEGRA_IOMMU_SMMU=y
  CONFIG_MEMORY=y
 +CONFIG_TI_AEMIF=y
  CONFIG_IIO=y
  CONFIG_XILINX_XADC=y
  CONFIG_AK8975=y
@@@ -467,10 -458,8 +472,10 @@@ CONFIG_PWM_VT8500=
  CONFIG_PHY_HIX5HD2_SATA=y
  CONFIG_OMAP_USB2=y
  CONFIG_TI_PIPE3=y
 +CONFIG_PHY_MIPHY28LP=y
  CONFIG_PHY_MIPHY365X=y
  CONFIG_PHY_STIH41X_USB=y
 +CONFIG_PHY_STIH407_USB=y
  CONFIG_PHY_SUN4I_USB=y
  CONFIG_EXT4_FS=y
  CONFIG_AUTOFS4_FS=y
@@@ -496,4 -485,3 +501,4 @@@ CONFIG_MAGIC_SYSRQ=
  CONFIG_LOCKUP_DETECTOR=y
  CONFIG_CRYPTO_DEV_TEGRA_AES=y
  CONFIG_CPUFREQ_DT=y
 +CONFIG_KEYSTONE_IRQ=y