Merge branch 'next/defconfig' into next/late

* next/defconfig: (45 commits)
  ARM: multi_v7_defconfig: Enable PBIAS regulator
  ARM: add TC2 PM support to multi_v7_defconfig
  ARM: tegra: Update multi_v7_defconfig
  ARM: tegra: Update default configuration
  ARM: at91/defconfig: at91_dt: remove ARM_AT91_ETHER
  ARM: at91/defconfig: at91_dt: enable DRM hlcdc support
  ARM: at91: at91_dt_defconfig: enable ISI and ov2640 support
  ARM: multi_v7_defconfig: Enable Allwinner P2WI, PWM, DMA_SUN6I, cryptodev
  ARM: sunxi_defconfig: Enable DMA_SUN6I, P2WI, PWM, cryptodev, EXTCON, FHANDLE
  ARM: shmobile: Enable fixed voltage regulator in shmobile_defconfig
  ARM: multi_v7_defconfig: Select MX6UL and MX7D
  ARM: prima2_defconfig: enable build for hwspinlock
  ARM: prima2_defconfig: enable build for RTC
  ARM: prima2_defconfig: enable build for misc input
  ARM: prima2_defconfig: enable build for SiRFSoC SDHC host
  ARM: prima2_defconfig: fix the outdated defconfig
  ARM: imx_v6_v7_defconfig: Select CONFIG_IKCONFIG_PROC
  ARM: defconfig: orion5x: add DT support
  ARM: qcom_defconfig: Enable options for KS8851 ethernet
  ARM: multi_v7_defconfig: Enable support for PWM Regulators
  ...

diff --combined arch/arm/configs/multi_v7_defconfig
index 606c2cdcb2a664e116d104e5218e8e70d250f074,52ebbc5570ff8f67fe224deb82fb57658ee44ab0..0ee0d50d758350ceee3e6f62da73078d73896d94
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -49,6 -49,8 +49,8 @@@ CONFIG_SOC_IMX53=
  CONFIG_SOC_IMX6Q=y
  CONFIG_SOC_IMX6SL=y
  CONFIG_SOC_IMX6SX=y
+ CONFIG_SOC_IMX6UL=y
+ CONFIG_SOC_IMX7D=y
  CONFIG_SOC_VF610=y
  CONFIG_SOC_LS1021A=y
  CONFIG_ARCH_OMAP3=y
@@@ -80,6 -82,7 +82,7 @@@ CONFIG_ARCH_R8A7778=
  CONFIG_ARCH_R8A7779=y
  CONFIG_ARCH_R8A7790=y
  CONFIG_ARCH_R8A7791=y
+ CONFIG_ARCH_R8A7793=y
  CONFIG_ARCH_R8A7794=y
  CONFIG_ARCH_SH73A0=y
  CONFIG_MACH_MARZEN=y
@@@ -98,6 -101,7 +101,7 @@@ CONFIG_MACH_SNOWBALL=
  CONFIG_MACH_UX500_DT=y
  CONFIG_ARCH_VEXPRESS=y
  CONFIG_ARCH_VEXPRESS_CA9X4=y
+ CONFIG_ARCH_VEXPRESS_TC2_PM=y
  CONFIG_ARCH_WM8850=y
  CONFIG_ARCH_ZYNQ=y
  CONFIG_TRUSTED_FOUNDATIONS=y
@@@ -251,6 -255,7 +255,7 @@@ CONFIG_SERIAL_8250_CONSOLE=
  CONFIG_SERIAL_8250_DW=y
  CONFIG_SERIAL_8250_EM=y
  CONFIG_SERIAL_8250_MT6577=y
+ CONFIG_SERIAL_8250_UNIPHIER=y
  CONFIG_SERIAL_AMBA_PL011=y
  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
  CONFIG_SERIAL_ATMEL=y
@@@ -301,6 -306,7 +306,7 @@@ CONFIG_I2C_S3C2410=
  CONFIG_I2C_SH_MOBILE=y
  CONFIG_I2C_SIRF=y
  CONFIG_I2C_ST=y
+ CONFIG_I2C_SUN6I_P2WI=y
  CONFIG_I2C_TEGRA=y
  CONFIG_I2C_XILINX=y
  CONFIG_I2C_RCAR=y
@@@ -356,7 -362,6 +362,7 @@@ CONFIG_POWER_RESET_KEYSTONE=
  CONFIG_POWER_RESET_RMOBILE=y
  CONFIG_SENSORS_LM90=y
  CONFIG_SENSORS_LM95245=y
 +CONFIG_SENSORS_NTC_THERMISTOR=m
  CONFIG_THERMAL=y
  CONFIG_CPU_THERMAL=y
  CONFIG_RCAR_THERMAL=y
@@@ -371,7 -376,9 +377,9 @@@ CONFIG_ARM_SP805_WATCHDOG=
  CONFIG_ORION_WATCHDOG=y
  CONFIG_ST_LPC_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
+ CONFIG_TEGRA_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=y
+ CONFIG_DIGICOLOR_WATCHDOG=y
  CONFIG_MFD_AS3711=y
  CONFIG_MFD_AS3722=y
  CONFIG_MFD_BCM590XX=y
@@@ -403,8 -410,9 +411,10 @@@ CONFIG_REGULATOR_MAX8907=
  CONFIG_REGULATOR_MAX8973=y
  CONFIG_REGULATOR_MAX77686=y
  CONFIG_REGULATOR_MAX77693=m
 +CONFIG_REGULATOR_MAX77802=m
  CONFIG_REGULATOR_PALMAS=y
+ CONFIG_REGULATOR_PBIAS=y
+ CONFIG_REGULATOR_PWM=m
  CONFIG_REGULATOR_S2MPS11=y
  CONFIG_REGULATOR_S5M8767=y
  CONFIG_REGULATOR_TPS51632=y
@@@ -431,8 -439,11 +441,11 @@@ CONFIG_VIDEO_RENESAS_VSP1=
  CONFIG_VIDEO_ADV7180=m
  CONFIG_VIDEO_ML86V7667=m
  CONFIG_DRM=y
+ # CONFIG_DRM_I2C_CH7006 is not set
+ # CONFIG_DRM_I2C_SIL164 is not set
  CONFIG_DRM_PTN3460=m
  CONFIG_DRM_PS8622=m
+ CONFIG_DRM_NOUVEAU=m
  CONFIG_DRM_EXYNOS=m
  CONFIG_DRM_EXYNOS_DSI=y
  CONFIG_DRM_EXYNOS_FIMD=y
@@@ -456,12 -467,18 +469,18 @@@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=
  CONFIG_SOUND=m
  CONFIG_SND=m
  CONFIG_SND_DYNAMIC_MINORS=y
+ CONFIG_SND_HDA_TEGRA=m
+ CONFIG_SND_HDA_INPUT_BEEP=y
+ CONFIG_SND_HDA_PATCH_LOADER=y
+ CONFIG_SND_HDA_CODEC_REALTEK=m
+ CONFIG_SND_HDA_CODEC_HDMI=m
  CONFIG_SND_USB_AUDIO=y
  CONFIG_SND_SOC=m
  CONFIG_SND_ATMEL_SOC=m
  CONFIG_SND_ATMEL_SOC_WM8904=m
  CONFIG_SND_SOC_SH4_FSI=m
  CONFIG_SND_SOC_RCAR=m
+ CONFIG_SND_SOC_RSRC_CARD=m
  CONFIG_SND_SOC_TEGRA=m
  CONFIG_SND_SOC_TEGRA_RT5640=m
  CONFIG_SND_SOC_TEGRA_WM8753=m
@@@ -493,6 -510,8 +512,6 @@@ CONFIG_USB_CHIPIDEA_HOST=
  CONFIG_AB8500_USB=y
  CONFIG_KEYSTONE_USB_PHY=y
  CONFIG_OMAP_USB3=y
 -CONFIG_SAMSUNG_USB2PHY=y
 -CONFIG_SAMSUNG_USB3PHY=y
  CONFIG_USB_GPIO_VBUS=y
  CONFIG_USB_ISP1301=y
  CONFIG_USB_MXS_PHY=y
@@@ -587,6 -606,7 +606,7 @@@ CONFIG_IMX_DMA=
  CONFIG_MXS_DMA=y
  CONFIG_DMA_OMAP=y
  CONFIG_XILINX_VDMA=y
+ CONFIG_DMA_SUN6I=y
  CONFIG_STAGING=y
  CONFIG_SENSORS_ISL29018=y
  CONFIG_SENSORS_ISL29028=y
@@@ -612,10 -632,10 +632,11 @@@ CONFIG_TEGRA_IOMMU_SMMU=
  CONFIG_PM_DEVFREQ=y
  CONFIG_ARM_TEGRA_DEVFREQ=m
  CONFIG_MEMORY=y
+ CONFIG_EXTCON=y
  CONFIG_TI_AEMIF=y
  CONFIG_IIO=y
  CONFIG_AT91_ADC=m
 +CONFIG_EXYNOS_ADC=m
  CONFIG_XILINX_XADC=y
  CONFIG_AK8975=y
  CONFIG_PWM=y
@@@ -623,9 -643,11 +644,11 @@@ CONFIG_PWM_ATMEL=
  CONFIG_PWM_ATMEL_TCB=m
  CONFIG_PWM_RENESAS_TPU=y
  CONFIG_PWM_SAMSUNG=m
+ CONFIG_PWM_SUN4I=y
  CONFIG_PWM_TEGRA=y
  CONFIG_PWM_VT8500=y
  CONFIG_PHY_HIX5HD2_SATA=y
+ CONFIG_PWM_STI=m
  CONFIG_OMAP_USB2=y
  CONFIG_TI_PIPE3=y
  CONFIG_PHY_MIPHY28LP=y
@@@ -661,6 -683,7 +684,7 @@@ CONFIG_LOCKUP_DETECTOR=
  CONFIG_CRYPTO_DEV_TEGRA_AES=y
  CONFIG_CPUFREQ_DT=y
  CONFIG_KEYSTONE_IRQ=y
+ CONFIG_CRYPTO_DEV_SUN4I_SS=m
  CONFIG_ARM_CRYPTO=y
  CONFIG_CRYPTO_SHA1_ARM=m
  CONFIG_CRYPTO_SHA1_ARM_NEON=m