Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC defconfig updates from Olof Johansson:
 "As usual, a bunch of commits, mostly adding drivers and other options
  to defconfigs because it makes sense to have them enabled on various
  development or product boards.  Too much to enumerate each here.

  There's an introduction of a pxa_defconfig, since PXA finally will
  allow building a shared kernel for all boards.  With this, we can
  hopefully remove a bunch of individual defconfigs down the road but it
  requires a bit of real life testing and transition period"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits)
  ARM: Add CONFIG_DEPRECATED_PARAM_STRUCT to netwinder_defconfig
  ARM: multi_v7_defconfig: Add rockchip audio support
  arm: multi_v7_defconfig: Add virtio drivers
  ARM: zx_defconfig: remove CONFIG_MMC_DW_IDMAC
  ARM: versatile: enable the right LEDs
  ARM: pxa: add defconfig covering all the boards
  ARM: versatile: select some defaults in defconfig
  ARM: multi_v7_defconfig: Enable fan, sensors and audio for Odroid XU3
  ARM: bcm2835: enable auxiliary spi driver in defconfig
  ARM: bcm2835: enable all bcm2835-relevant in defconfig
  ARM: default to multi_v7_defconfig
  ARM: multi_v7_defconfig: enable rk808 clkout module
  ARM: multi_v7_defconfig: enable rockchip crypto module
  ARM: multi_v7_defconfig: enable Rockchip io-domain driver
  ARM: multi_v7_defconfig: Enable generic SoC internal OMAP regulators
  ARM: multi_v7_defconfig: Enable AM437x PMIC TPS65218
  ARM: multi_v7_defconfig: enable TPS65217 regulator
  ARM: realview: select apropriate targets
  ARM: defconfig: qcom: Enable SSBI drivers
  ARM: defconfig: Update qcom_defconfig
  ...

diff --combined arch/arm/Makefile
index d1da24885af08fc9ac116edc785cbccbe5646b72,e9fb67913e6e32f2d12ff7abdc6fb4164d9a5764..fe254108d1d92c88bb05b90221ca314edcaceedb
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -30,9 -30,8 +30,8 @@@ GZFLAGS               :=-
  # Never generate .eh_frame
  KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm)
  
- # Do not use arch/arm/defconfig - it's always outdated.
- # Select a platform tht is kept up-to-date
- KBUILD_DEFCONFIG := versatile_defconfig
+ # This should work on most of the modern platforms
+ KBUILD_DEFCONFIG := multi_v7_defconfig
  
  # defines filename extension depending memory management type.
  ifeq ($(CONFIG_MMU),)
@@@ -211,7 -210,6 +210,7 @@@ machine-$(CONFIG_ARCH_SOCFPGA)             += socf
  machine-$(CONFIG_ARCH_STI)            += sti
  machine-$(CONFIG_ARCH_STM32)          += stm32
  machine-$(CONFIG_ARCH_SUNXI)          += sunxi
 +machine-$(CONFIG_ARCH_TANGO)          += tango
  machine-$(CONFIG_ARCH_TEGRA)          += tegra
  machine-$(CONFIG_ARCH_U300)           += u300
  machine-$(CONFIG_ARCH_U8500)          += ux500

diff --combined arch/arm/configs/multi_v7_defconfig
index e347a558a4cd0689db5ae23aecf7c11898edd0cd,0cc8408a94674579e3c1e11c35a8c1d69b30fb27..314f6be2dca2b4aec6aaa82cc8cfb2ba06c2bb29
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -11,9 -11,6 +11,9 @@@ CONFIG_MODULES=
  CONFIG_MODULE_UNLOAD=y
  CONFIG_PARTITION_ADVANCED=y
  CONFIG_CMDLINE_PARTITION=y
 +CONFIG_ARCH_MULTI_V7=y
 +# CONFIG_ARCH_MULTI_V5 is not set
 +# CONFIG_ARCH_MULTI_V4 is not set
  CONFIG_ARCH_VIRT=y
  CONFIG_ARCH_ALPINE=y
  CONFIG_ARCH_MVEBU=y
@@@ -78,7 -75,7 +78,7 @@@ CONFIG_MACH_SPEAR1340=
  CONFIG_ARCH_STI=y
  CONFIG_ARCH_EXYNOS=y
  CONFIG_EXYNOS5420_MCPM=y
 -CONFIG_ARCH_SHMOBILE_MULTI=y
 +CONFIG_ARCH_RENESAS=y
  CONFIG_ARCH_EMEV2=y
  CONFIG_ARCH_R7S72100=y
  CONFIG_ARCH_R8A73A4=y
@@@ -128,6 -125,7 +128,7 @@@ CONFIG_KEXEC=
  CONFIG_CPU_FREQ=y
  CONFIG_CPU_FREQ_STAT_DETAILS=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+ CONFIG_QORIQ_CPUFREQ=y
  CONFIG_CPU_IDLE=y
  CONFIG_ARM_CPUIDLE=y
  CONFIG_NEON=y
@@@ -155,6 -153,7 +156,7 @@@ CONFIG_CAN_RAW=
  CONFIG_CAN_BCM=y
  CONFIG_CAN_DEV=y
  CONFIG_CAN_AT91=m
+ CONFIG_CAN_RCAR=m
  CONFIG_CAN_XILINXCAN=y
  CONFIG_CAN_MCP251X=y
  CONFIG_CAN_SUN4I=y
@@@ -172,6 -171,7 +174,7 @@@ CONFIG_DMA_CMA=
  CONFIG_CMA_SIZE_MBYTES=64
  CONFIG_OMAP_OCP2SCP=y
  CONFIG_SIMPLE_PM_BUS=y
+ CONFIG_SUNXI_RSB=m
  CONFIG_MTD=y
  CONFIG_MTD_CMDLINE_PARTS=y
  CONFIG_MTD_BLOCK=y
@@@ -181,17 -181,21 +184,21 @@@ CONFIG_MTD_NAND_ATMEL=
  CONFIG_MTD_NAND_BRCMNAND=y
  CONFIG_MTD_NAND_DAVINCI=y
  CONFIG_MTD_SPI_NOR=y
+ CONFIG_SPI_FSL_QUADSPI=m
  CONFIG_MTD_UBI=y
  CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_RAM=y
+ CONFIG_BLK_DEV_RAM_SIZE=65536
+ CONFIG_VIRTIO_BLK=y
  CONFIG_AD525X_DPOT=y
  CONFIG_AD525X_DPOT_I2C=y
  CONFIG_ATMEL_TCLIB=y
  CONFIG_ICS932S401=y
  CONFIG_ATMEL_SSC=m
+ CONFIG_QCOM_COINCELL=m
  CONFIG_APDS9802ALS=y
  CONFIG_ISL29003=y
  CONFIG_EEPROM_AT24=y
- CONFIG_EEPROM_SUNXI_SID=y
  CONFIG_BLK_DEV_SD=y
  CONFIG_BLK_DEV_SR=y
  CONFIG_SCSI_MULTI_LUN=y
@@@ -205,10 -209,12 +212,12 @@@ CONFIG_SATA_HIGHBANK=
  CONFIG_SATA_MV=y
  CONFIG_SATA_RCAR=y
  CONFIG_NETDEVICES=y
+ CONFIG_VIRTIO_NET=y
  CONFIG_HIX5HD2_GMAC=y
  CONFIG_SUN4I_EMAC=y
  CONFIG_MACB=y
  CONFIG_NET_CALXEDA_XGMAC=y
+ CONFIG_GIANFAR=y
  CONFIG_IGB=y
  CONFIG_MV643XX_ETH=y
  CONFIG_MVNETA=y
@@@ -225,6 -231,7 +234,7 @@@ CONFIG_MARVELL_PHY=
  CONFIG_SMSC_PHY=y
  CONFIG_BROADCOM_PHY=y
  CONFIG_ICPLUS_PHY=y
+ CONFIG_REALTEK_PHY=y
  CONFIG_MICREL_PHY=y
  CONFIG_FIXED_PHY=y
  CONFIG_USB_PEGASUS=y
@@@ -244,7 -251,7 +254,7 @@@ CONFIG_KEYBOARD_GPIO=
  CONFIG_KEYBOARD_TEGRA=y
  CONFIG_KEYBOARD_SPEAR=y
  CONFIG_KEYBOARD_ST_KEYSCAN=y
- CONFIG_KEYBOARD_CROS_EC=y
+ CONFIG_KEYBOARD_CROS_EC=m
  CONFIG_MOUSE_PS2_ELANTECH=y
  CONFIG_MOUSE_CYAPA=m
  CONFIG_MOUSE_ELAN_I2C=y
@@@ -255,8 -262,10 +265,10 @@@ CONFIG_TOUCHSCREEN_STMPE=
  CONFIG_TOUCHSCREEN_SUN4I=y
  CONFIG_TOUCHSCREEN_WM97XX=m
  CONFIG_INPUT_MISC=y
+ CONFIG_INPUT_MAX77693_HAPTIC=m
+ CONFIG_INPUT_MAX8997_HAPTIC=m
  CONFIG_INPUT_MPU3050=y
- CONFIG_INPUT_AXP20X_PEK=y
+ CONFIG_INPUT_AXP20X_PEK=m
  CONFIG_INPUT_ADXL34X=m
  CONFIG_SERIO_AMBAKMI=y
  CONFIG_SERIAL_8250=y
@@@ -297,6 -306,8 +309,8 @@@ CONFIG_SERIAL_CONEXANT_DIGICOLOR=
  CONFIG_SERIAL_CONEXANT_DIGICOLOR_CONSOLE=y
  CONFIG_SERIAL_ST_ASC=y
  CONFIG_SERIAL_ST_ASC_CONSOLE=y
+ CONFIG_HVC_DRIVER=y
+ CONFIG_VIRTIO_CONSOLE=y
  CONFIG_I2C_CHARDEV=y
  CONFIG_I2C_DAVINCI=y
  CONFIG_I2C_MUX=y
@@@ -307,8 -318,10 +321,10 @@@ CONFIG_I2C_AT91=
  CONFIG_I2C_CADENCE=y
  CONFIG_I2C_DESIGNWARE_PLATFORM=y
  CONFIG_I2C_DIGICOLOR=m
+ CONFIG_I2C_EMEV2=m
  CONFIG_I2C_GPIO=m
  CONFIG_I2C_EXYNOS5=y
+ CONFIG_I2C_IMX=m
  CONFIG_I2C_MV64XXX=y
  CONFIG_I2C_RIIC=y
  CONFIG_I2C_RK3X=y
@@@ -327,6 -340,7 +343,7 @@@ CONFIG_SPI=
  CONFIG_SPI_ATMEL=m
  CONFIG_SPI_CADENCE=y
  CONFIG_SPI_DAVINCI=y
+ CONFIG_SPI_FSL_DSPI=m
  CONFIG_SPI_OMAP24XX=y
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
@@@ -343,10 -357,18 +360,18 @@@ CONFIG_SPI_TEGRA20_SFLASH=
  CONFIG_SPI_TEGRA20_SLINK=y
  CONFIG_SPI_XILINX=y
  CONFIG_SPI_SPIDEV=y
+ CONFIG_SPMI=y
  CONFIG_PINCTRL_AS3722=y
  CONFIG_PINCTRL_PALMAS=y
  CONFIG_PINCTRL_APQ8064=y
  CONFIG_PINCTRL_APQ8084=y
+ CONFIG_PINCTRL_IPQ8064=y
+ CONFIG_PINCTRL_MSM8660=y
+ CONFIG_PINCTRL_MSM8960=y
+ CONFIG_PINCTRL_MSM8X74=y
+ CONFIG_PINCTRL_MSM8916=y
+ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
+ CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_GENERIC_PLATFORM=y
  CONFIG_GPIO_DAVINCI=y
@@@ -368,6 -390,7 +393,7 @@@ CONFIG_BATTERY_MAX17040=
  CONFIG_BATTERY_MAX17042=m
  CONFIG_CHARGER_MAX14577=m
  CONFIG_CHARGER_MAX77693=m
+ CONFIG_CHARGER_MAX8997=m
  CONFIG_CHARGER_TPS65090=y
  CONFIG_AXP20X_POWER=m
  CONFIG_POWER_RESET_AS3722=y
@@@ -375,10 -398,13 +401,13 @@@ CONFIG_POWER_RESET_GPIO=
  CONFIG_POWER_RESET_GPIO_RESTART=y
  CONFIG_POWER_RESET_KEYSTONE=y
  CONFIG_POWER_RESET_RMOBILE=y
+ CONFIG_POWER_AVS=y
+ CONFIG_ROCKCHIP_IODOMAIN=y
  CONFIG_SENSORS_LM90=y
  CONFIG_SENSORS_LM95245=y
  CONFIG_SENSORS_NTC_THERMISTOR=m
- CONFIG_THERMAL=y
+ CONFIG_SENSORS_PWM_FAN=m
+ CONFIG_SENSORS_INA2XX=m
  CONFIG_CPU_THERMAL=y
  CONFIG_ROCKCHIP_THERMAL=y
  CONFIG_RCAR_THERMAL=y
@@@ -388,11 -414,13 +417,13 @@@ CONFIG_EXYNOS_THERMAL=
  CONFIG_ST_THERMAL_SYSCFG=y
  CONFIG_ST_THERMAL_MEMMAP=y
  CONFIG_WATCHDOG=y
+ CONFIG_DA9063_WATCHDOG=m
  CONFIG_XILINX_WATCHDOG=y
  CONFIG_ARM_SP805_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
  CONFIG_ST_LPC_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
+ CONFIG_IMX2_WDT=y
  CONFIG_TEGRA_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=y
  CONFIG_DIGICOLOR_WATCHDOG=y
@@@ -401,27 -429,34 +432,34 @@@ CONFIG_MFD_AS3722=
  CONFIG_MFD_ATMEL_FLEXCOM=y
  CONFIG_MFD_BCM590XX=y
  CONFIG_MFD_AXP20X=y
- CONFIG_MFD_CROS_EC=y
+ CONFIG_MFD_AXP20X_I2C=m
+ CONFIG_MFD_AXP20X_RSB=m
+ CONFIG_MFD_CROS_EC=m
  CONFIG_MFD_CROS_EC_I2C=m
- CONFIG_MFD_CROS_EC_SPI=y
+ CONFIG_MFD_CROS_EC_SPI=m
+ CONFIG_MFD_DA9063=m
  CONFIG_MFD_MAX14577=y
  CONFIG_MFD_MAX77686=y
  CONFIG_MFD_MAX77693=y
  CONFIG_MFD_MAX8907=y
+ CONFIG_MFD_MAX8997=y
  CONFIG_MFD_RK808=y
  CONFIG_MFD_PM8921_CORE=y
  CONFIG_MFD_QCOM_RPM=y
+ CONFIG_MFD_SPMI_PMIC=y
  CONFIG_MFD_SEC_CORE=y
  CONFIG_MFD_STMPE=y
  CONFIG_MFD_PALMAS=y
  CONFIG_MFD_TPS65090=y
+ CONFIG_MFD_TPS65217=y
+ CONFIG_MFD_TPS65218=y
  CONFIG_MFD_TPS6586X=y
  CONFIG_MFD_TPS65910=y
  CONFIG_REGULATOR_AB8500=y
  CONFIG_REGULATOR_ACT8865=y
  CONFIG_REGULATOR_AS3711=y
  CONFIG_REGULATOR_AS3722=y
- CONFIG_REGULATOR_AXP20X=y
+ CONFIG_REGULATOR_AXP20X=m
  CONFIG_REGULATOR_BCM590XX=y
  CONFIG_REGULATOR_DA9210=y
  CONFIG_REGULATOR_FAN53555=y
@@@ -432,6 -467,7 +470,7 @@@ CONFIG_POWER_RESET_SYSCON=
  CONFIG_REGULATOR_MAX14577=m
  CONFIG_REGULATOR_MAX8907=y
  CONFIG_REGULATOR_MAX8973=y
+ CONFIG_REGULATOR_MAX8997=m
  CONFIG_REGULATOR_MAX77686=y
  CONFIG_REGULATOR_MAX77693=m
  CONFIG_REGULATOR_MAX77802=m
@@@ -442,9 -478,12 +481,12 @@@ CONFIG_REGULATOR_QCOM_RPM=
  CONFIG_REGULATOR_QCOM_SMD_RPM=y
  CONFIG_REGULATOR_S2MPS11=y
  CONFIG_REGULATOR_S5M8767=y
+ CONFIG_REGULATOR_TI_ABB=y
  CONFIG_REGULATOR_TPS51632=y
  CONFIG_REGULATOR_TPS62360=y
  CONFIG_REGULATOR_TPS65090=y
+ CONFIG_REGULATOR_TPS65217=y
+ CONFIG_REGULATOR_TPS65218=y
  CONFIG_REGULATOR_TPS6586X=y
  CONFIG_REGULATOR_TPS65910=y
  CONFIG_REGULATOR_TWL4030=y
@@@ -461,6 -500,7 +503,7 @@@ CONFIG_SOC_CAMERA=
  CONFIG_SOC_CAMERA_PLATFORM=m
  CONFIG_VIDEO_RCAR_VIN=m
  CONFIG_V4L_MEM2MEM_DRIVERS=y
+ CONFIG_VIDEO_RENESAS_JPU=m
  CONFIG_VIDEO_RENESAS_VSP1=m
  # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  CONFIG_VIDEO_ADV7180=m
@@@ -504,13 -544,21 +547,21 @@@ CONFIG_SND_HDA_INPUT_BEEP=
  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_USB_AUDIO=m
  CONFIG_SND_SOC=m
  CONFIG_SND_ATMEL_SOC=m
  CONFIG_SND_ATMEL_SOC_WM8904=m
+ CONFIG_SND_SOC_FSL_SAI=m
+ CONFIG_SND_SOC_ROCKCHIP=m
+ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
+ CONFIG_SND_SOC_ROCKCHIP_RT5645=m
  CONFIG_SND_SOC_SH4_FSI=m
  CONFIG_SND_SOC_RCAR=m
  CONFIG_SND_SOC_RSRC_CARD=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
@@@ -520,6 -568,8 +571,8 @@@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=
  CONFIG_SND_SOC_TEGRA_ALC5632=m
  CONFIG_SND_SOC_TEGRA_MAX98090=m
  CONFIG_SND_SOC_AK4642=m
+ CONFIG_SND_SOC_SGTL5000=m
+ CONFIG_SND_SOC_SPDIF=m
  CONFIG_SND_SOC_WM8978=m
  CONFIG_USB=y
  CONFIG_USB_XHCI_HCD=y
@@@ -549,7 -599,6 +602,6 @@@ CONFIG_USB_GPIO_VBUS=
  CONFIG_USB_ISP1301=y
  CONFIG_USB_MSM_OTG=m
  CONFIG_USB_MXS_PHY=y
- CONFIG_USB_RCAR_PHY=m
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_USB_ETH=m
@@@ -560,6 -609,7 +612,7 @@@ CONFIG_MMC_SDHCI=
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SDHCI_OF_ARASAN=y
  CONFIG_MMC_SDHCI_OF_AT91=y
+ CONFIG_MMC_SDHCI_OF_ESDHC=m
  CONFIG_MMC_SDHCI_ESDHC_IMX=y
  CONFIG_MMC_SDHCI_DOVE=y
  CONFIG_MMC_SDHCI_TEGRA=y
@@@ -572,6 -622,7 +625,7 @@@ CONFIG_MMC_SDHCI_ST=
  CONFIG_MMC_OMAP=y
  CONFIG_MMC_OMAP_HS=y
  CONFIG_MMC_ATMELMCI=y
+ CONFIG_MMC_SDHCI_MSM=y
  CONFIG_MMC_MVSDIO=y
  CONFIG_MMC_SDHI=y
  CONFIG_MMC_DW=y
@@@ -583,8 -634,11 +637,11 @@@ CONFIG_MMC_SH_MMCIF=
  CONFIG_MMC_SUNXI=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
+ CONFIG_LEDS_CLASS_FLASH=m
  CONFIG_LEDS_GPIO=y
  CONFIG_LEDS_PWM=y
+ CONFIG_LEDS_MAX77693=m
+ CONFIG_LEDS_MAX8997=m
  CONFIG_LEDS_TRIGGERS=y
  CONFIG_LEDS_TRIGGER_TIMER=y
  CONFIG_LEDS_TRIGGER_ONESHOT=y
@@@ -604,6 -658,7 +661,7 @@@ CONFIG_RTC_DRV_AS3722=
  CONFIG_RTC_DRV_DS1307=y
  CONFIG_RTC_DRV_HYM8563=m
  CONFIG_RTC_DRV_MAX8907=y
+ CONFIG_RTC_DRV_MAX8997=m
  CONFIG_RTC_DRV_MAX77686=y
  CONFIG_RTC_DRV_RK808=m
  CONFIG_RTC_DRV_MAX77802=m
@@@ -616,6 -671,7 +674,7 @@@ CONFIG_RTC_DRV_TPS65910=
  CONFIG_RTC_DRV_S35390A=m
  CONFIG_RTC_DRV_RX8581=m
  CONFIG_RTC_DRV_EM3027=y
+ CONFIG_RTC_DRV_DA9063=m
  CONFIG_RTC_DRV_DIGICOLOR=m
  CONFIG_RTC_DRV_S5M=m
  CONFIG_RTC_DRV_S3C=m
@@@ -631,10 -687,12 +690,12 @@@ CONFIG_DMADEVICES=
  CONFIG_DW_DMAC=y
  CONFIG_AT_HDMAC=y
  CONFIG_AT_XDMAC=y
+ CONFIG_FSL_EDMA=m
  CONFIG_MV_XOR=y
  CONFIG_TEGRA20_APB_DMA=y
  CONFIG_SH_DMAE=y
  CONFIG_RCAR_DMAC=y
+ CONFIG_RENESAS_USB_DMAC=m
  CONFIG_STE_DMA40=y
  CONFIG_SIRF_DMA=y
  CONFIG_TI_EDMA=y
@@@ -656,14 -714,20 +717,20 @@@ CONFIG_NVEC_POWER=
  CONFIG_NVEC_PAZ00=y
  CONFIG_QCOM_GSBI=y
  CONFIG_QCOM_PM=y
+ CONFIG_QCOM_SMEM=y
  CONFIG_QCOM_SMD=y
  CONFIG_QCOM_SMD_RPM=y
- CONFIG_QCOM_SMEM=y
+ CONFIG_QCOM_SMP2P=y
+ CONFIG_QCOM_SMSM=y
+ CONFIG_QCOM_WCNSS_CTRL=m
+ CONFIG_ROCKCHIP_PM_DOMAINS=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_CHROME_PLATFORMS=y
+ CONFIG_STAGING_BOARD=y
  CONFIG_CROS_EC_CHARDEV=m
  CONFIG_COMMON_CLK_MAX77686=y
  CONFIG_COMMON_CLK_MAX77802=m
+ CONFIG_COMMON_CLK_RK808=m
  CONFIG_COMMON_CLK_S2MPS11=m
  CONFIG_APQ_MMCC_8084=y
  CONFIG_MSM_GCC_8660=y
@@@ -687,6 -751,7 +754,7 @@@ CONFIG_AK8975=
  CONFIG_PWM=y
  CONFIG_PWM_ATMEL=m
  CONFIG_PWM_ATMEL_TCB=m
+ CONFIG_PWM_FSL_FTM=m
  CONFIG_PWM_RENESAS_TPU=y
  CONFIG_PWM_ROCKCHIP=m
  CONFIG_PWM_SAMSUNG=m
@@@ -709,6 -774,8 +777,8 @@@ CONFIG_PHY_STIH407_USB=
  CONFIG_PHY_SUN4I_USB=y
  CONFIG_PHY_SUN9I_USB=y
  CONFIG_PHY_SAMSUNG_USB2=m
+ CONFIG_NVMEM=y
+ CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_EXT4_FS=y
  CONFIG_AUTOFS4_FS=y
  CONFIG_MSDOS_FS=y
@@@ -735,6 -802,7 +805,7 @@@ CONFIG_CRYPTO_DEV_TEGRA_AES=
  CONFIG_CPUFREQ_DT=y
  CONFIG_KEYSTONE_IRQ=y
  CONFIG_CRYPTO_DEV_SUN4I_SS=m
+ CONFIG_CRYPTO_DEV_ROCKCHIP=m
  CONFIG_ARM_CRYPTO=y
  CONFIG_CRYPTO_SHA1_ARM=m
  CONFIG_CRYPTO_SHA1_ARM_NEON=m
@@@ -749,3 -817,7 +820,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_VIRTIO=y
+ CONFIG_VIRTIO_PCI=y
+ CONFIG_VIRTIO_PCI_LEGACY=y
+ CONFIG_VIRTIO_MMIO=y

diff --combined arch/arm/configs/shmobile_defconfig
index cc8ece33a7e38796da3210c0e14a5f8a24e95e8b,5bc4f537f9da7dbc2192c0b0db62afbe99b5af02..969738324a5d5f815263a12cf2f580098603cf4a
--- 1/arch/arm/configs/shmobile_defconfig
--- 2/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@@ -2,14 -2,13 +2,13 @@@ CONFIG_SYSVIPC=
  CONFIG_NO_HZ=y
  CONFIG_IKCONFIG=y
  CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=16
  CONFIG_BLK_DEV_INITRD=y
  CONFIG_CC_OPTIMIZE_FOR_SIZE=y
  CONFIG_SYSCTL_SYSCALL=y
  CONFIG_EMBEDDED=y
  CONFIG_PERF_EVENTS=y
  CONFIG_SLAB=y
 -CONFIG_ARCH_SHMOBILE_MULTI=y
 +CONFIG_ARCH_RENESAS=y
  CONFIG_ARCH_EMEV2=y
  CONFIG_ARCH_R7S72100=y
  CONFIG_ARCH_R8A73A4=y
@@@ -53,6 -52,8 +52,8 @@@ CONFIG_UNIX=
  CONFIG_INET=y
  CONFIG_IP_PNP=y
  CONFIG_IP_PNP_DHCP=y
+ CONFIG_CAN=y
+ CONFIG_CAN_RCAR=y
  CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
@@@ -99,6 -100,7 +100,7 @@@ CONFIG_SERIAL_SH_SCI=
  CONFIG_SERIAL_SH_SCI_NR_UARTS=20
  CONFIG_SERIAL_SH_SCI_CONSOLE=y
  CONFIG_I2C_CHARDEV=y
+ CONFIG_I2C_EMEV2=y
  CONFIG_I2C_GPIO=y
  CONFIG_I2C_RIIC=y
  CONFIG_I2C_SH_MOBILE=y
@@@ -135,6 -137,7 +137,7 @@@ CONFIG_SOC_CAMERA=
  CONFIG_SOC_CAMERA_PLATFORM=y
  CONFIG_VIDEO_RCAR_VIN=y
  CONFIG_V4L_MEM2MEM_DRIVERS=y
+ CONFIG_VIDEO_RENESAS_JPU=y
  CONFIG_VIDEO_RENESAS_VSP1=y
  # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  CONFIG_VIDEO_ADV7180=y
@@@ -150,6 -153,7 +153,7 @@@ CONFIG_FB_SH_MOBILE_MERAM=
  # CONFIG_BACKLIGHT_GENERIC is not set
  CONFIG_BACKLIGHT_PWM=y
  CONFIG_BACKLIGHT_AS3711=y
+ CONFIG_FRAMEBUFFER_CONSOLE=y
  CONFIG_SOUND=y
  CONFIG_SND=y
  CONFIG_SND_SOC=y
@@@ -163,7 -167,6 +167,6 @@@ CONFIG_USB_EHCI_HCD=
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_R8A66597_HCD=y
  CONFIG_USB_RENESAS_USBHS=y
- CONFIG_USB_RCAR_PHY=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=y
  CONFIG_USB_ETH=y
@@@ -177,9 -180,13 +180,13 @@@ CONFIG_RTC_CLASS=
  CONFIG_RTC_DRV_RS5C372=y
  CONFIG_RTC_DRV_S35390A=y
  CONFIG_RTC_DRV_RX8581=y
+ CONFIG_RTC_DRV_DA9063=y
  CONFIG_DMADEVICES=y
  CONFIG_SH_DMAE=y
  CONFIG_RCAR_DMAC=y
+ CONFIG_RENESAS_USB_DMAC=y
+ CONFIG_STAGING=y
+ CONFIG_STAGING_BOARD=y
  # CONFIG_IOMMU_SUPPORT is not set
  CONFIG_IIO=y
  CONFIG_AK8975=y
@@@ -199,6 -206,7 +206,7 @@@ CONFIG_NFS_V4_1=
  CONFIG_ROOT_NFS=y
  CONFIG_NLS_CODEPAGE_437=y
  CONFIG_NLS_ISO8859_1=y
+ CONFIG_PRINTK_TIME=y
  # CONFIG_ENABLE_WARN_DEPRECATED is not set
  # CONFIG_ENABLE_MUST_CHECK is not set
  # CONFIG_ARM_UNWIND is not set

diff --combined arch/arm/configs/sunxi_defconfig
index b503a89441bf25ce5cda365a17cb7a172c28b4e2,50270cc95ccbd7c84cb59db8075bc5508e2ae892..a9a81a714be461ee48542ee4563feb26d88abc7e
--- 1/arch/arm/configs/sunxi_defconfig
--- 2/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@@ -11,14 -11,12 +11,12 @@@ CONFIG_SMP=
  CONFIG_NR_CPUS=8
  CONFIG_AEABI=y
  CONFIG_HIGHMEM=y
- CONFIG_HIGHPTE=y
  CONFIG_ARM_APPENDED_DTB=y
  CONFIG_ARM_ATAG_DTB_COMPAT=y
  CONFIG_CPU_FREQ=y
  CONFIG_CPUFREQ_DT=y
  CONFIG_VFP=y
  CONFIG_NEON=y
- CONFIG_PM=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -37,7 -35,6 +35,6 @@@ CONFIG_CAN_SUN4I=
  # CONFIG_WIRELESS is not set
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
- CONFIG_EEPROM_SUNXI_SID=y
  CONFIG_BLK_DEV_SD=y
  CONFIG_ATA=y
  CONFIG_AHCI_SUNXI=y
@@@ -61,13 -58,12 +58,12 @@@ CONFIG_STMMAC_ETH=
  # CONFIG_NET_VENDOR_WIZNET is not set
  # CONFIG_WLAN is not set
  # CONFIG_INPUT_MOUSEDEV is not set
- # CONFIG_INPUT_KEYBOARD is not set
+ CONFIG_KEYBOARD_SUN4I_LRADC=y
  # CONFIG_INPUT_MOUSE is not set
- CONFIG_INPUT_MISC=y
- CONFIG_INPUT_AXP20X_PEK=y
  CONFIG_INPUT_TOUCHSCREEN=y
- CONFIG_KEYBOARD_SUN4I_LRADC=y
  CONFIG_TOUCHSCREEN_SUN4I=y
+ CONFIG_INPUT_MISC=y
+ CONFIG_INPUT_AXP20X_PEK=y
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
  CONFIG_SERIAL_8250_NR_UARTS=8
@@@ -84,12 -80,13 +80,14 @@@ CONFIG_SPI_SUN4I=
  CONFIG_SPI_SUN6I=y
  CONFIG_GPIO_SYSFS=y
  CONFIG_POWER_SUPPLY=y
 +CONFIG_AXP20X_POWER=y
  CONFIG_THERMAL=y
  CONFIG_CPU_THERMAL=y
  CONFIG_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
  CONFIG_MFD_AXP20X=y
+ CONFIG_MFD_AXP20X_I2C=y
+ CONFIG_MFD_AXP20X_RSB=y
  CONFIG_REGULATOR=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
  CONFIG_REGULATOR_AXP20X=y
@@@ -124,6 -121,8 +122,8 @@@ CONFIG_PWM=
  CONFIG_PWM_SUN4I=y
  CONFIG_PHY_SUN4I_USB=y
  CONFIG_PHY_SUN9I_USB=y
+ CONFIG_NVMEM=y
+ CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_EXT4_FS=y
  CONFIG_VFAT_FS=y
  CONFIG_TMPFS=y

diff --combined arch/arm/configs/versatile_defconfig
index 64bef9775bb6146d4fb92425474bdfc548422df8,9fa53b34b2ddbe19dbe5047a751c22b0c055f1bd..295408ea9dc7b278584b796dfbaedfb9439f3bdd
--- 1/arch/arm/configs/versatile_defconfig
--- 2/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@@ -1,13 -1,15 +1,15 @@@
  # CONFIG_LOCALVERSION_AUTO is not set
  CONFIG_SYSVIPC=y
+ CONFIG_NO_HZ_IDLE=y
+ CONFIG_HIGH_RES_TIMERS=y
  CONFIG_LOG_BUF_SHIFT=14
  CONFIG_BLK_DEV_INITRD=y
  CONFIG_SLAB=y
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
  CONFIG_PARTITION_ADVANCED=y
 +# CONFIG_ARCH_MULTI_V7 is not set
  CONFIG_ARCH_VERSATILE=y
 -CONFIG_MACH_VERSATILE_AB=y
  CONFIG_AEABI=y
  CONFIG_OABI_COMPAT=y
  CONFIG_ZBOOT_ROM_TEXT=0x0
@@@ -47,9 -49,12 +49,12 @@@ CONFIG_SERIAL_AMBA_PL011=
  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
  CONFIG_I2C=y
  CONFIG_I2C_CHARDEV=m
+ CONFIG_I2C_VERSATILE=y
+ CONFIG_SPI=y
  CONFIG_GPIOLIB=y
  CONFIG_GPIO_PL061=y
  # CONFIG_HWMON is not set
+ CONFIG_MFD_SYSCON=y
  CONFIG_FB=y
  CONFIG_FB_ARMCLCD=y
  CONFIG_FRAMEBUFFER_CONSOLE=y
@@@ -59,13 -64,15 +64,15 @@@ CONFIG_SND_MIXER_OSS=
  CONFIG_SND_PCM_OSS=m
  CONFIG_SND_ARMAACI=m
  CONFIG_MMC=y
- CONFIG_MMC_ARMMMCI=m
+ CONFIG_MMC_ARMMMCI=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
- CONFIG_LEDS_VERSATILE=y
+ CONFIG_LEDS_SYSCON=y
  CONFIG_LEDS_TRIGGERS=y
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  CONFIG_LEDS_TRIGGER_CPU=y
+ CONFIG_RTC_CLASS=y
+ CONFIG_RTC_DRV_DS1307=y
  CONFIG_EXT2_FS=y
  CONFIG_VFAT_FS=m
  CONFIG_JFFS2_FS=y
@@@ -82,5 -89,6 +89,5 @@@ CONFIG_MAGIC_SYSRQ=
  CONFIG_DEBUG_KERNEL=y
  CONFIG_DEBUG_USER=y
  CONFIG_DEBUG_LL=y
 -CONFIG_DEBUG_LL_UART_PL01X=y
  CONFIG_FONTS=y
  CONFIG_FONT_ACORN_8x8=y