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

Pull ARM SoC defconfig updates from Kevin Hilman:
 "We keep collecting defconfig updates in a separate branch mostly to
  encourage people to handle them separately and avoid conflicts between
  different topics.

  Most of these are enablement of new SoCs, boards or drivers that have
  come in, or minor config refreshes due to reorderings in Kconfig
  files, etc.  I.e. mostly minor churn of various kinds"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
  ARM: multi_v7_defconfig: remove duplicate CONFIG_COMMON_CLK_QCOM=y
  ARM: multi_v7_defconfig: Enable display on Trats2 board
  ARM64: add GPIO keys to the defconfig
  ARM: keystone: defconfig: enable netcp driver by default
  ARM: exynos_defconfig: Enable CONFIG_SENSORS_INA2XX for Odroid-XU3
  ARM: exynos_defconfig: Enable CONFIG_SENSORS_PWM_FAN for Odroid-XU3
  ARM: omap2plus_defconfig: Enable TOUCHSCREEN_PIXCIR
  ARM: omap2plus_defconfig: Add dm816x USB PHY as a loadable module
  ARM: omap2plus_defconifg: Enable DM9000 in omap2plus_defconfig
  ARM: lpc18xx: remove DEBUG_LL_UART_8250 from defconfig
  ARM: multi_v7_defconfig: Make media support modular
  ARM: multi_v7_defconfig: Make sound support modular
  ARM: multi_v7_defconfig: Enable shmobile r8a7778/bockw platform
  ARM: exynos_defconfig: savedefconfig
  ARM: exynos_defconfig: Enable display on Trats2 board
  ARM: multi_v7_defconfig: Enable OHCI on exynos SoCs
  ARM: multi_v7_defconfig: Enable TMU for exynos SoCs
  ARM: multi_v7_defconfig: Enable PMIC and MUIC drivers for exynos
  ARM: multi_v7_defconfig: Enable CPU idle for exynos SoCs
  ARM: multi_v7_defconfig: Enable Cypress APA I2C Trackpad support
  ...

diff --combined arch/arm/configs/efm32_defconfig
index e969f78,f242610..c0dac0f
--- 1/arch/arm/configs/efm32_defconfig
--- 2/arch/arm/configs/efm32_defconfig
+++ b/arch/arm/configs/efm32_defconfig
@@@ -16,7 -16,6 +16,7 @@@ CONFIG_EMBEDDED=
  # CONFIG_IOSCHED_DEADLINE is not set
  # CONFIG_IOSCHED_CFQ is not set
  # CONFIG_MMU is not set
 +CONFIG_ARM_SINGLE_ARMV7M=y
  CONFIG_ARCH_EFM32=y
  CONFIG_SET_MEM_PARAM=y
  CONFIG_DRAM_BASE=0x88000000
@@@ -86,7 -85,6 +86,6 @@@ CONFIG_GPIO_SYSFS=
  # CONFIG_USB_SUPPORT is not set
  CONFIG_MMC=y
  CONFIG_MMC_SPI=y
- # CONFIG_IOMMU_SUPPORT is not set
  CONFIG_EXT2_FS=y
  # CONFIG_FILE_LOCKING is not set
  # CONFIG_DNOTIFY is not set

diff --combined arch/arm/configs/multi_v7_defconfig
index fbbb191,ba90cb5..fd6a6d2
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -20,6 -20,9 +20,9 @@@ CONFIG_MACH_ARMADA_38X=
  CONFIG_MACH_ARMADA_39X=y
  CONFIG_MACH_ARMADA_XP=y
  CONFIG_MACH_DOVE=y
+ CONFIG_ARCH_AT91=y
+ CONFIG_SOC_SAMA5D3=y
+ CONFIG_SOC_SAMA5D4=y
  CONFIG_ARCH_BCM=y
  CONFIG_ARCH_BCM_CYGNUS=y
  CONFIG_ARCH_BCM_21664=y
@@@ -30,6 -33,7 +33,7 @@@ CONFIG_ARCH_BERLIN=
  CONFIG_MACH_BERLIN_BG2=y
  CONFIG_MACH_BERLIN_BG2CD=y
  CONFIG_MACH_BERLIN_BG2Q=y
+ CONFIG_ARCH_DIGICOLOR=y
  CONFIG_ARCH_HIGHBANK=y
  CONFIG_ARCH_HISI=y
  CONFIG_ARCH_HI3xxx=y
@@@ -72,6 -76,7 +76,7 @@@ CONFIG_ARCH_EMEV2=
  CONFIG_ARCH_R7S72100=y
  CONFIG_ARCH_R8A73A4=y
  CONFIG_ARCH_R8A7740=y
+ CONFIG_ARCH_R8A7778=y
  CONFIG_ARCH_R8A7779=y
  CONFIG_ARCH_R8A7790=y
  CONFIG_ARCH_R8A7791=y
@@@ -86,6 -91,7 +91,7 @@@ CONFIG_ARCH_TEGRA_3x_SOC=
  CONFIG_ARCH_TEGRA_114_SOC=y
  CONFIG_ARCH_TEGRA_124_SOC=y
  CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+ CONFIG_ARCH_UNIPHIER=y
  CONFIG_ARCH_U8500=y
  CONFIG_MACH_HREFV60=y
  CONFIG_MACH_SNOWBALL=y
@@@ -115,8 -121,11 +121,11 @@@ CONFIG_CPU_FREQ=
  CONFIG_CPU_FREQ_STAT_DETAILS=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  CONFIG_CPU_IDLE=y
+ CONFIG_ARM_CPUIDLE=y
  CONFIG_NEON=y
+ CONFIG_KERNEL_MODE_NEON=y
  CONFIG_ARM_ZYNQ_CPUIDLE=y
+ CONFIG_ARM_EXYNOS_CPUIDLE=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -137,6 -146,7 +146,7 @@@ CONFIG_CAN=
  CONFIG_CAN_RAW=y
  CONFIG_CAN_BCM=y
  CONFIG_CAN_DEV=y
+ CONFIG_CAN_AT91=m
  CONFIG_CAN_XILINXCAN=y
  CONFIG_CAN_MCP251X=y
  CONFIG_BT=m
@@@ -158,13 -168,16 +168,16 @@@ CONFIG_MTD_CMDLINE_PARTS=
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_M25P80=y
  CONFIG_MTD_NAND=y
+ CONFIG_MTD_NAND_ATMEL=y
  CONFIG_MTD_NAND_DAVINCI=y
  CONFIG_MTD_SPI_NOR=y
  CONFIG_MTD_UBI=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_AD525X_DPOT=y
  CONFIG_AD525X_DPOT_I2C=y
+ CONFIG_ATMEL_TCLIB=y
  CONFIG_ICS932S401=y
+ CONFIG_ATMEL_SSC=m
  CONFIG_APDS9802ALS=y
  CONFIG_ISL29003=y
  CONFIG_EEPROM_AT24=y
@@@ -213,12 -226,14 +226,14 @@@ CONFIG_MWIFIEX=
  CONFIG_MWIFIEX_SDIO=m
  CONFIG_INPUT_JOYDEV=y
  CONFIG_INPUT_EVDEV=y
+ CONFIG_KEYBOARD_QT1070=m
  CONFIG_KEYBOARD_GPIO=y
  CONFIG_KEYBOARD_TEGRA=y
  CONFIG_KEYBOARD_SPEAR=y
  CONFIG_KEYBOARD_ST_KEYSCAN=y
  CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_MOUSE_PS2_ELANTECH=y
+ CONFIG_MOUSE_CYAPA=m
  CONFIG_MOUSE_ELAN_I2C=y
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ATMEL_MXT=y
@@@ -237,6 -252,9 +252,9 @@@ CONFIG_SERIAL_8250_EM=
  CONFIG_SERIAL_8250_MT6577=y
  CONFIG_SERIAL_AMBA_PL011=y
  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+ CONFIG_SERIAL_ATMEL=y
+ CONFIG_SERIAL_ATMEL_CONSOLE=y
+ CONFIG_SERIAL_ATMEL_TTYAT=y
  CONFIG_SERIAL_MESON=y
  CONFIG_SERIAL_MESON_CONSOLE=y
  CONFIG_SERIAL_SAMSUNG=y
@@@ -260,15 -278,20 +278,20 @@@ CONFIG_SERIAL_XILINX_PS_UART=
  CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
  CONFIG_SERIAL_FSL_LPUART=y
  CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+ CONFIG_SERIAL_CONEXANT_DIGICOLOR=y
+ CONFIG_SERIAL_CONEXANT_DIGICOLOR_CONSOLE=y
  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_ARB_GPIO_CHALLENGE=m
  CONFIG_I2C_MUX_PCA954x=y
  CONFIG_I2C_MUX_PINCTRL=y
+ CONFIG_I2C_AT91=m
  CONFIG_I2C_CADENCE=y
  CONFIG_I2C_DESIGNWARE_PLATFORM=y
+ CONFIG_I2C_DIGICOLOR=m
  CONFIG_I2C_GPIO=m
  CONFIG_I2C_EXYNOS5=y
  CONFIG_I2C_MV64XXX=y
@@@ -280,13 -303,16 +303,16 @@@ CONFIG_I2C_ST=
  CONFIG_I2C_TEGRA=y
  CONFIG_I2C_XILINX=y
  CONFIG_I2C_RCAR=y
+ CONFIG_I2C_CROS_EC_TUNNEL=m
  CONFIG_SPI=y
+ CONFIG_SPI_ATMEL=m
  CONFIG_SPI_CADENCE=y
  CONFIG_SPI_DAVINCI=y
  CONFIG_SPI_OMAP24XX=y
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
  CONFIG_SPI_RSPI=y
+ CONFIG_SPI_S3C64XX=m
  CONFIG_SPI_SH_MSIOF=m
  CONFIG_SPI_SH_HSPI=y
  CONFIG_SPI_SIRF=y
@@@ -317,6 -343,10 +343,10 @@@ CONFIG_GPIO_SYSCON=
  CONFIG_GPIO_TPS6586X=y
  CONFIG_GPIO_TPS65910=y
  CONFIG_BATTERY_SBS=y
+ CONFIG_BATTERY_MAX17040=m
+ CONFIG_BATTERY_MAX17042=m
+ CONFIG_CHARGER_MAX14577=m
+ CONFIG_CHARGER_MAX77693=m
  CONFIG_CHARGER_TPS65090=y
  CONFIG_POWER_RESET_AS3722=y
  CONFIG_POWER_RESET_GPIO=y
@@@ -330,13 -360,15 +360,15 @@@ CONFIG_THERMAL=
  CONFIG_CPU_THERMAL=y
  CONFIG_RCAR_THERMAL=y
  CONFIG_ARMADA_THERMAL=y
- CONFIG_DAVINCI_WATCHDOG
+ CONFIG_DAVINCI_WATCHDOG=m
+ CONFIG_EXYNOS_THERMAL=m
  CONFIG_ST_THERMAL_SYSCFG=y
  CONFIG_ST_THERMAL_MEMMAP=y
  CONFIG_WATCHDOG=y
  CONFIG_XILINX_WATCHDOG=y
  CONFIG_ARM_SP805_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
+ CONFIG_ST_LPC_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
  CONFIG_MESON_WATCHDOG=y
  CONFIG_MFD_AS3711=y
@@@ -344,8 -376,11 +376,11 @@@ CONFIG_MFD_AS3722=
  CONFIG_MFD_BCM590XX=y
  CONFIG_MFD_AXP20X=y
  CONFIG_MFD_CROS_EC=y
+ CONFIG_MFD_CROS_EC_I2C=m
  CONFIG_MFD_CROS_EC_SPI=y
+ CONFIG_MFD_MAX14577=y
  CONFIG_MFD_MAX77686=y
+ CONFIG_MFD_MAX77693=y
  CONFIG_MFD_MAX8907=y
  CONFIG_MFD_SEC_CORE=y
  CONFIG_MFD_STMPE=y
@@@ -362,9 -397,11 +397,11 @@@ CONFIG_REGULATOR_DA9210=
  CONFIG_REGULATOR_GPIO=y
  CONFIG_MFD_SYSCON=y
  CONFIG_POWER_RESET_SYSCON=y
+ CONFIG_REGULATOR_MAX14577=m
  CONFIG_REGULATOR_MAX8907=y
  CONFIG_REGULATOR_MAX8973=y
  CONFIG_REGULATOR_MAX77686=y
+ CONFIG_REGULATOR_MAX77693=m
  CONFIG_REGULATOR_PALMAS=y
  CONFIG_REGULATOR_S2MPS11=y
  CONFIG_REGULATOR_S5M8767=y
@@@ -375,7 -412,7 +412,7 @@@ CONFIG_REGULATOR_TPS6586X=
  CONFIG_REGULATOR_TPS65910=y
  CONFIG_REGULATOR_TWL4030=y
  CONFIG_REGULATOR_VEXPRESS=y
- CONFIG_MEDIA_SUPPORT=y
+ CONFIG_MEDIA_SUPPORT=m
  CONFIG_MEDIA_CAMERA_SUPPORT=y
  CONFIG_MEDIA_CONTROLLER=y
  CONFIG_VIDEO_V4L2_SUBDEV_API=y
@@@ -390,9 -427,17 +427,17 @@@ CONFIG_V4L_MEM2MEM_DRIVERS=
  CONFIG_VIDEO_RENESAS_VSP1=m
  # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  CONFIG_VIDEO_ADV7180=m
+ CONFIG_VIDEO_ML86V7667=m
  CONFIG_DRM=y
+ CONFIG_DRM_PTN3460=m
+ CONFIG_DRM_PS8622=m
+ CONFIG_DRM_EXYNOS=m
+ CONFIG_DRM_EXYNOS_DSI=y
+ CONFIG_DRM_EXYNOS_FIMD=y
+ CONFIG_DRM_EXYNOS_HDMI=y
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_TEGRA=y
+ CONFIG_DRM_PANEL_S6E8AA0=m
  CONFIG_DRM_PANEL_SIMPLE=y
  CONFIG_FB_ARMCLCD=y
  CONFIG_FB_WM8505=y
@@@ -401,24 -446,27 +446,27 @@@ CONFIG_FB_SIMPLE=
  CONFIG_FB_SH_MOBILE_MERAM=y
  CONFIG_BACKLIGHT_LCD_SUPPORT=y
  CONFIG_BACKLIGHT_CLASS_DEVICE=y
+ CONFIG_LCD_PLATFORM=m
  CONFIG_BACKLIGHT_PWM=y
  CONFIG_BACKLIGHT_AS3711=y
  CONFIG_FRAMEBUFFER_CONSOLE=y
  CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
- CONFIG_SOUND=y
- CONFIG_SND=y
+ CONFIG_SOUND=m
+ CONFIG_SND=m
  CONFIG_SND_DYNAMIC_MINORS=y
  CONFIG_SND_USB_AUDIO=y
- CONFIG_SND_SOC=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_TEGRA=y
- CONFIG_SND_SOC_TEGRA_RT5640=y
- CONFIG_SND_SOC_TEGRA_WM8753=y
- CONFIG_SND_SOC_TEGRA_WM8903=y
- CONFIG_SND_SOC_TEGRA_TRIMSLICE=y
- CONFIG_SND_SOC_TEGRA_ALC5632=y
- CONFIG_SND_SOC_TEGRA_MAX98090=y
+ CONFIG_SND_SOC_TEGRA=m
+ CONFIG_SND_SOC_TEGRA_RT5640=m
+ CONFIG_SND_SOC_TEGRA_WM8753=m
+ CONFIG_SND_SOC_TEGRA_WM8903=m
+ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+ CONFIG_SND_SOC_TEGRA_ALC5632=m
+ CONFIG_SND_SOC_TEGRA_MAX98090=m
  CONFIG_SND_SOC_AK4642=m
  CONFIG_SND_SOC_WM8978=m
  CONFIG_USB=y
@@@ -429,10 -477,11 +477,11 @@@ CONFIG_USB_EHCI_EXYNOS=
  CONFIG_USB_EHCI_TEGRA=y
  CONFIG_USB_EHCI_HCD_STI=y
  CONFIG_USB_EHCI_HCD_PLATFORM=y
 -CONFIG_USB_ISP1760_HCD=y
 +CONFIG_USB_ISP1760=y
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_HCD_STI=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y
+ CONFIG_USB_OHCI_EXYNOS=m
  CONFIG_USB_R8A66597_HCD=m
  CONFIG_USB_RENESAS_USBHS=m
  CONFIG_USB_STORAGE=y
@@@ -448,7 -497,6 +497,6 @@@ CONFIG_USB_GPIO_VBUS=
  CONFIG_USB_ISP1301=y
  CONFIG_USB_MXS_PHY=y
  CONFIG_USB_RCAR_PHY=m
- CONFIG_USB_RCAR_GEN2_PHY=m
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_MMC=y
@@@ -468,6 -516,7 +516,7 @@@ CONFIG_MMC_SDHCI_BCM_KONA=
  CONFIG_MMC_SDHCI_ST=y
  CONFIG_MMC_OMAP=y
  CONFIG_MMC_OMAP_HS=y
+ CONFIG_MMC_ATMELMCI=y
  CONFIG_MMC_MVSDIO=y
  CONFIG_MMC_SDHI=y
  CONFIG_MMC_DW=y
@@@ -500,14 -549,22 +549,22 @@@ CONFIG_RTC_DRV_AS3722=
  CONFIG_RTC_DRV_DS1307=y
  CONFIG_RTC_DRV_MAX8907=y
  CONFIG_RTC_DRV_MAX77686=y
+ CONFIG_RTC_DRV_MAX77802=m
  CONFIG_RTC_DRV_RS5C372=m
  CONFIG_RTC_DRV_PALMAS=y
+ CONFIG_RTC_DRV_ST_LPC=y
  CONFIG_RTC_DRV_TWL4030=y
  CONFIG_RTC_DRV_TPS6586X=y
  CONFIG_RTC_DRV_TPS65910=y
  CONFIG_RTC_DRV_S35390A=m
+ CONFIG_RTC_DRV_RX8581=m
  CONFIG_RTC_DRV_EM3027=y
+ CONFIG_RTC_DRV_DIGICOLOR=m
+ CONFIG_RTC_DRV_S5M=m
+ CONFIG_RTC_DRV_S3C=m
  CONFIG_RTC_DRV_PL031=y
+ CONFIG_RTC_DRV_AT91RM9200=m
+ CONFIG_RTC_DRV_AT91SAM9=m
  CONFIG_RTC_DRV_VT8500=y
  CONFIG_RTC_DRV_SUN6I=y
  CONFIG_RTC_DRV_SUNXI=y
@@@ -515,6 -572,8 +572,8 @@@ CONFIG_RTC_DRV_MV=
  CONFIG_RTC_DRV_TEGRA=y
  CONFIG_DMADEVICES=y
  CONFIG_DW_DMAC=y
+ CONFIG_AT_HDMAC=y
+ CONFIG_AT_XDMAC=y
  CONFIG_MV_XOR=y
  CONFIG_TEGRA20_APB_DMA=y
  CONFIG_SH_DMAE=y
@@@ -537,8 -596,13 +596,13 @@@ CONFIG_SERIO_NVEC_PS2=
  CONFIG_NVEC_POWER=y
  CONFIG_NVEC_PAZ00=y
  CONFIG_QCOM_GSBI=y
+ CONFIG_QCOM_PM=y
  CONFIG_COMMON_CLK_QCOM=y
+ CONFIG_CHROME_PLATFORMS=y
+ CONFIG_CROS_EC_CHARDEV=m
  CONFIG_COMMON_CLK_MAX77686=y
+ CONFIG_COMMON_CLK_MAX77802=m
+ CONFIG_COMMON_CLK_S2MPS11=m
  CONFIG_APQ_MMCC_8084=y
  CONFIG_MSM_GCC_8660=y
  CONFIG_MSM_MMCC_8960=y
@@@ -550,10 -614,14 +614,14 @@@ CONFIG_ARM_TEGRA_DEVFREQ=
  CONFIG_MEMORY=y
  CONFIG_TI_AEMIF=y
  CONFIG_IIO=y
+ CONFIG_AT91_ADC=m
  CONFIG_XILINX_XADC=y
  CONFIG_AK8975=y
  CONFIG_PWM=y
+ CONFIG_PWM_ATMEL=m
+ CONFIG_PWM_ATMEL_TCB=m
  CONFIG_PWM_RENESAS_TPU=y
+ CONFIG_PWM_SAMSUNG=m
  CONFIG_PWM_TEGRA=y
  CONFIG_PWM_VT8500=y
  CONFIG_PHY_HIX5HD2_SATA=y
@@@ -561,10 -629,12 +629,12 @@@ CONFIG_OMAP_USB2=
  CONFIG_TI_PIPE3=y
  CONFIG_PHY_MIPHY28LP=y
  CONFIG_PHY_MIPHY365X=y
+ CONFIG_PHY_RCAR_GEN2=m
  CONFIG_PHY_STIH41X_USB=y
  CONFIG_PHY_STIH407_USB=y
  CONFIG_PHY_SUN4I_USB=y
  CONFIG_PHY_SUN9I_USB=y
+ CONFIG_PHY_SAMSUNG_USB2=m
  CONFIG_EXT4_FS=y
  CONFIG_AUTOFS4_FS=y
  CONFIG_MSDOS_FS=y
@@@ -590,3 -660,17 +660,17 @@@ CONFIG_LOCKUP_DETECTOR=
  CONFIG_CRYPTO_DEV_TEGRA_AES=y
  CONFIG_CPUFREQ_DT=y
  CONFIG_KEYSTONE_IRQ=y
+ CONFIG_ARM_CRYPTO=y
+ CONFIG_CRYPTO_SHA1_ARM=m
+ CONFIG_CRYPTO_SHA1_ARM_NEON=m
+ CONFIG_CRYPTO_SHA1_ARM_CE=m
+ CONFIG_CRYPTO_SHA2_ARM_CE=m
+ CONFIG_CRYPTO_SHA256_ARM=m
+ CONFIG_CRYPTO_SHA512_ARM=m
+ CONFIG_CRYPTO_AES_ARM=m
+ CONFIG_CRYPTO_AES_ARM_BS=m
+ CONFIG_CRYPTO_AES_ARM_CE=m
+ CONFIG_CRYPTO_GHASH_ARM_CE=m
+ CONFIG_CRYPTO_DEV_ATMEL_AES=m
+ CONFIG_CRYPTO_DEV_ATMEL_TDES=m
+ CONFIG_CRYPTO_DEV_ATMEL_SHA=m

diff --combined arch/arm64/configs/defconfig
index 0fb452b,b8760c3..f38c94f
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -33,7 -33,6 +33,7 @@@ CONFIG_MODULE_UNLOAD=
  # CONFIG_IOSCHED_DEADLINE is not set
  CONFIG_ARCH_EXYNOS7=y
  CONFIG_ARCH_FSL_LS2085A=y
 +CONFIG_ARCH_HISI=y
  CONFIG_ARCH_MEDIATEK=y
  CONFIG_ARCH_SEATTLE=y
  CONFIG_ARCH_TEGRA=y
@@@ -95,6 -94,7 +95,7 @@@ CONFIG_SMC91X=
  CONFIG_SMSC911X=y
  # CONFIG_WLAN is not set
  CONFIG_INPUT_EVDEV=y
+ CONFIG_KEYBOARD_GPIO=y
  # CONFIG_SERIO_SERPORT is not set
  CONFIG_SERIO_AMBAKMI=y
  CONFIG_LEGACY_PTY_COUNT=16
@@@ -139,12 -139,6 +140,12 @@@ CONFIG_MMC_ARMMMCI=
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SPI=y
 +CONFIG_NEW_LEDS=y
 +CONFIG_LEDS_CLASS=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_EFI=y
  CONFIG_RTC_DRV_XGENE=y
@@@ -187,7 -181,6 +188,7 @@@ CONFIG_LOCKUP_DETECTOR=
  # CONFIG_SCHED_DEBUG is not set
  # CONFIG_DEBUG_PREEMPT is not set
  # CONFIG_FTRACE is not set
 +CONFIG_MEMTEST=y
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
  CONFIG_ARM64_CRYPTO=y