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

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

Two patches to enable the DRM driver in the sunxi and multi_v7 defconfig.

* tag 'sunxi-defconfig-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Enable sun4i DRM driver
  ARM: multi_v7: Enable sun4i DRM driver

diff --combined arch/arm/configs/multi_v7_defconfig
index 29e84c3f6e675809b6740708683f14b41d4a489e,42dd0b8f42eeace877323dfe2bd43687dde8a1c8..8d189350e8ba2fef3fb7c059014a9616c4db1ea8
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -36,7 -36,6 +36,7 @@@ CONFIG_ARCH_BCM_21664=
  CONFIG_ARCH_BCM_281XX=y
  CONFIG_ARCH_BCM_5301X=y
  CONFIG_ARCH_BCM2835=y
 +CONFIG_ARCH_BCM_63XX=y
  CONFIG_ARCH_BRCMSTB=y
  CONFIG_ARCH_BERLIN=y
  CONFIG_MACH_BERLIN_BG2=y
@@@ -91,7 -90,6 +91,7 @@@ CONFIG_ARCH_R8A7778=
  CONFIG_ARCH_R8A7779=y
  CONFIG_ARCH_R8A7790=y
  CONFIG_ARCH_R8A7791=y
 +CONFIG_ARCH_R8A7792=y
  CONFIG_ARCH_R8A7793=y
  CONFIG_ARCH_R8A7794=y
  CONFIG_ARCH_SH73A0=y
@@@ -159,8 -157,6 +159,8 @@@ CONFIG_INET6_IPCOMP=
  CONFIG_IPV6_MIP6=m
  CONFIG_IPV6_TUNNEL=m
  CONFIG_IPV6_MULTIPLE_TABLES=y
 +CONFIG_NET_DSA=m
 +CONFIG_NET_SWITCHDEV=y
  CONFIG_CAN=y
  CONFIG_CAN_RAW=y
  CONFIG_CAN_BCM=y
@@@ -169,7 -165,6 +169,7 @@@ CONFIG_CAN_AT91=
  CONFIG_CAN_RCAR=m
  CONFIG_CAN_XILINXCAN=y
  CONFIG_CAN_MCP251X=y
 +CONFIG_NET_DSA_BCM_SF2=m
  CONFIG_CAN_SUN4I=y
  CONFIG_BT=m
  CONFIG_BT_MRVL=m
@@@ -218,7 -213,6 +218,7 @@@ CONFIG_SCSI_MULTI_LUN=
  CONFIG_ATA=y
  CONFIG_SATA_AHCI=y
  CONFIG_SATA_AHCI_PLATFORM=y
 +CONFIG_AHCI_BRCM=y
  CONFIG_AHCI_ST=y
  CONFIG_AHCI_SUNXI=y
  CONFIG_AHCI_TEGRA=y
@@@ -230,8 -224,6 +230,8 @@@ CONFIG_VIRTIO_NET=
  CONFIG_HIX5HD2_GMAC=y
  CONFIG_SUN4I_EMAC=y
  CONFIG_MACB=y
 +CONFIG_BCMGENET=m
 +CONFIG_SYSTEMPORT=m
  CONFIG_NET_CALXEDA_XGMAC=y
  CONFIG_GIANFAR=y
  CONFIG_IGB=y
@@@ -277,7 -269,6 +277,7 @@@ CONFIG_MOUSE_CYAPA=
  CONFIG_MOUSE_ELAN_I2C=y
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ATMEL_MXT=y
 +CONFIG_TOUCHSCREEN_MMS114=m
  CONFIG_TOUCHSCREEN_ST1232=m
  CONFIG_TOUCHSCREEN_STMPE=y
  CONFIG_TOUCHSCREEN_SUN4I=y
@@@ -300,8 -291,6 +300,8 @@@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=
  CONFIG_SERIAL_ATMEL=y
  CONFIG_SERIAL_ATMEL_CONSOLE=y
  CONFIG_SERIAL_ATMEL_TTYAT=y
 +CONFIG_SERIAL_BCM63XX=y
 +CONFIG_SERIAL_BCM63XX_CONSOLE=y
  CONFIG_SERIAL_MESON=y
  CONFIG_SERIAL_MESON_CONSOLE=y
  CONFIG_SERIAL_SAMSUNG=y
@@@ -368,7 -357,6 +368,7 @@@ CONFIG_SPI_BCM2835=
  CONFIG_SPI_BCM2835AUX=y
  CONFIG_SPI_CADENCE=y
  CONFIG_SPI_DAVINCI=y
 +CONFIG_SPI_GPIO=m
  CONFIG_SPI_FSL_DSPI=m
  CONFIG_SPI_OMAP24XX=y
  CONFIG_SPI_ORION=y
@@@ -415,14 -403,12 +415,14 @@@ CONFIG_GPIO_PALMAS=
  CONFIG_GPIO_SYSCON=y
  CONFIG_GPIO_TPS6586X=y
  CONFIG_GPIO_TPS65910=y
 +CONFIG_BATTERY_ACT8945A=y
  CONFIG_BATTERY_SBS=y
  CONFIG_BATTERY_MAX17040=m
  CONFIG_BATTERY_MAX17042=m
  CONFIG_CHARGER_MAX14577=m
  CONFIG_CHARGER_MAX77693=m
  CONFIG_CHARGER_MAX8997=m
 +CONFIG_CHARGER_MAX8998=m
  CONFIG_CHARGER_TPS65090=y
  CONFIG_AXP20X_POWER=m
  CONFIG_POWER_RESET_AS3722=y
@@@ -462,9 -448,6 +462,9 @@@ CONFIG_MESON_WATCHDOG=
  CONFIG_DW_WATCHDOG=y
  CONFIG_DIGICOLOR_WATCHDOG=y
  CONFIG_BCM2835_WDT=y
 +CONFIG_BCM7038_WDT=m
 +CONFIG_BCM_KONA_WDT=y
 +CONFIG_MFD_ACT8945A=y
  CONFIG_MFD_AS3711=y
  CONFIG_MFD_AS3722=y
  CONFIG_MFD_ATMEL_FLEXCOM=y
@@@ -479,10 -462,9 +479,10 @@@ CONFIG_MFD_CROS_EC_SPI=
  CONFIG_MFD_DA9063=m
  CONFIG_MFD_MAX14577=y
  CONFIG_MFD_MAX77686=y
 -CONFIG_MFD_MAX77693=y
 +CONFIG_MFD_MAX77693=m
  CONFIG_MFD_MAX8907=y
  CONFIG_MFD_MAX8997=y
 +CONFIG_MFD_MAX8998=y
  CONFIG_MFD_RK808=y
  CONFIG_MFD_PM8921_CORE=y
  CONFIG_MFD_QCOM_RPM=y
@@@ -495,7 -477,6 +495,7 @@@ CONFIG_MFD_TPS65217=
  CONFIG_MFD_TPS65218=y
  CONFIG_MFD_TPS6586X=y
  CONFIG_MFD_TPS65910=y
 +CONFIG_REGULATOR_ACT8945A=y
  CONFIG_REGULATOR_AB8500=y
  CONFIG_REGULATOR_ACT8865=y
  CONFIG_REGULATOR_AS3711=y
@@@ -513,7 -494,6 +513,7 @@@ CONFIG_REGULATOR_MAX14577=
  CONFIG_REGULATOR_MAX8907=y
  CONFIG_REGULATOR_MAX8973=y
  CONFIG_REGULATOR_MAX8997=m
 +CONFIG_REGULATOR_MAX8998=m
  CONFIG_REGULATOR_MAX77686=y
  CONFIG_REGULATOR_MAX77693=m
  CONFIG_REGULATOR_MAX77802=m
@@@ -534,7 -514,6 +534,7 @@@ CONFIG_REGULATOR_TPS6586X=
  CONFIG_REGULATOR_TPS65910=y
  CONFIG_REGULATOR_TWL4030=y
  CONFIG_REGULATOR_VEXPRESS=y
 +CONFIG_REGULATOR_WM8994=m
  CONFIG_MEDIA_SUPPORT=m
  CONFIG_MEDIA_CAMERA_SUPPORT=y
  CONFIG_MEDIA_CONTROLLER=y
@@@ -547,17 -526,9 +547,17 @@@ CONFIG_SOC_CAMERA=
  CONFIG_SOC_CAMERA_PLATFORM=m
  CONFIG_VIDEO_RCAR_VIN=m
  CONFIG_VIDEO_ATMEL_ISI=m
 +CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
 +CONFIG_VIDEO_S5P_FIMC=m
 +CONFIG_VIDEO_S5P_MIPI_CSIS=m
 +CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
 +CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
  CONFIG_V4L_MEM2MEM_DRIVERS=y
 +CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 +CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
  CONFIG_VIDEO_RENESAS_JPU=m
  CONFIG_VIDEO_RENESAS_VSP1=m
 +CONFIG_V4L_TEST_DRIVERS=y
  # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  CONFIG_VIDEO_ADV7180=m
  CONFIG_VIDEO_ML86V7667=m
@@@ -569,10 -540,8 +569,10 @@@ CONFIG_DRM_NXP_PTN3460=
  CONFIG_DRM_PARADE_PS8622=m
  CONFIG_DRM_NOUVEAU=m
  CONFIG_DRM_EXYNOS=m
 -CONFIG_DRM_EXYNOS_DSI=y
  CONFIG_DRM_EXYNOS_FIMD=y
 +CONFIG_DRM_EXYNOS_MIXER=y
 +CONFIG_DRM_EXYNOS_DPI=y
 +CONFIG_DRM_EXYNOS_DSI=y
  CONFIG_DRM_EXYNOS_HDMI=y
  CONFIG_DRM_ROCKCHIP=m
  CONFIG_ROCKCHIP_ANALOGIX_DP=m
@@@ -583,8 -552,8 +583,9 @@@ CONFIG_DRM_ATMEL_HLCDC=
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_RCAR_HDMI=y
  CONFIG_DRM_RCAR_LVDS=y
+ CONFIG_DRM_SUN4I=m
  CONFIG_DRM_TEGRA=y
 +CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
  CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
  CONFIG_DRM_PANEL_SIMPLE=y
  CONFIG_DRM_VC4=y
@@@ -619,14 -588,13 +620,14 @@@ CONFIG_SND_SOC_ROCKCHIP=
  CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
  CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
  CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 +CONFIG_SND_SOC_SAMSUNG=m
 +CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 +CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 +CONFIG_SND_SOC_SNOW=m
  CONFIG_SND_SOC_SH4_FSI=m
  CONFIG_SND_SOC_RCAR=m
  CONFIG_SND_SOC_RSRC_CARD=m
  CONFIG_SND_SUN4I_CODEC=m
 -CONFIG_SND_SOC_SAMSUNG=m
 -CONFIG_SND_SOC_SNOW=m
 -CONFIG_SND_SOC_ODROIDX2=m
  CONFIG_SND_SOC_TEGRA=m
  CONFIG_SND_SOC_TEGRA_RT5640=m
  CONFIG_SND_SOC_TEGRA_WM8753=m
@@@ -732,7 -700,6 +733,7 @@@ CONFIG_RTC_DRV_AS3722=
  CONFIG_RTC_DRV_DS1307=y
  CONFIG_RTC_DRV_HYM8563=m
  CONFIG_RTC_DRV_MAX8907=y
 +CONFIG_RTC_DRV_MAX8998=m
  CONFIG_RTC_DRV_MAX8997=m
  CONFIG_RTC_DRV_MAX77686=y
  CONFIG_RTC_DRV_RK808=m
@@@ -824,7 -791,6 +825,7 @@@ CONFIG_BERLIN2_ADC=
  CONFIG_EXYNOS_ADC=m
  CONFIG_VF610_ADC=m
  CONFIG_XILINX_XADC=y
 +CONFIG_CM36651=m
  CONFIG_AK8975=y
  CONFIG_RASPBERRYPI_POWER=y
  CONFIG_PWM=y
@@@ -841,7 -807,6 +842,7 @@@ CONFIG_PWM_VT8500=
  CONFIG_PHY_HIX5HD2_SATA=y
  CONFIG_PWM_STI=y
  CONFIG_PWM_BCM2835=y
 +CONFIG_PWM_BRCMSTB=m
  CONFIG_OMAP_USB2=y
  CONFIG_TI_PIPE3=y
  CONFIG_PHY_BERLIN_USB=y
@@@ -858,7 -823,6 +859,7 @@@ CONFIG_PHY_SUN4I_USB=
  CONFIG_PHY_SUN9I_USB=y
  CONFIG_PHY_SAMSUNG_USB2=m
  CONFIG_PHY_TEGRA_XUSB=y
 +CONFIG_PHY_BRCM_SATA=y
  CONFIG_NVMEM=y
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_BCM2835_MBOX=y
@@@ -891,7 -855,6 +892,7 @@@ CONFIG_KEYSTONE_IRQ=
  CONFIG_HW_RANDOM=y
  CONFIG_HW_RANDOM_ST=y
  CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 +CONFIG_CRYPTO_DEV_S5P=m
  CONFIG_CRYPTO_DEV_SUN4I_SS=m
  CONFIG_CRYPTO_DEV_ROCKCHIP=m
  CONFIG_ARM_CRYPTO=y
@@@ -908,7 -871,6 +909,7 @@@ CONFIG_CRYPTO_GHASH_ARM_CE=
  CONFIG_CRYPTO_DEV_ATMEL_AES=m
  CONFIG_CRYPTO_DEV_ATMEL_TDES=m
  CONFIG_CRYPTO_DEV_ATMEL_SHA=m
 +CONFIG_VIDEO_VIVID=m
  CONFIG_VIRTIO=y
  CONFIG_VIRTIO_PCI=y
  CONFIG_VIRTIO_PCI_LEGACY=y