Commit e330eb86 ("ARM: multi_v7_defconfig: enable Rockchip io-domain
driver") turns on a driver that was broken on 4.4-rc3 and fixed in 4.4-rc4.

This backmerges in the bugfix from mainline to keep the defconfig branch
testable by itself.

* commit 'd7b53fd9':
  drm/rockchip: vop: Correct enabled clocks during setup
  drm/i915: Don't override output type for DDI HDMI
  drm/i915: Don't compare has_drrs strictly in pipe config
  drm/i915: Mark uneven memory banks on gen4 desktop as unknown swizzling

This updates the Versatile defconfig to:
- Use NO_HZ_IDLE and HIGH_RES_TIMERS
- Enable the I2C driver
- Enable the SPI driver
- Enable the RTC driver for DS1338 as found on the Versatile
  boards
- Compile in the MMCI MMC driver, which is good if you
  want to mount a root FS on the MMC card without having
  to first load this module from an initramfs

Patch tested on the Versatile AB, QEMU for Versatile AB
and QEMU for Versatile PB.

Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

For Odroid XU3-family enable the:
 - PWM fan (to control the CPU fan using thermal subsystem),
 - TI INA231 sensors (provide power measurements of big.LITTLE cores,
   DRAM and GPU),
 - Samsung sound (for Odroid XU3 and Snow as well).
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

add the auxiliary spi driver to the default config
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Rebuild bcm2835_defconfig using "make bcm2835_defconfig;
make savedefconfig", and enable manually the following features:

* all bcm2835-relevant drivers (MBOX, WDT, DMA, PWM, SND)
* enable regular stackprotector because CONFIG_CC_STACKPROTECTOR
  disappear
* enable some new dependencies in order to keep LED heartbeat
  ( CONFIG_NEW_LEDS, CONFIG_LEDS_CLASS, CONFIG_LEDS_TRIGGERS )

The following options were removed, because they are enabled implicit:

CONFIG_RD_BZIP2, CONFIG_RD_LZMA, CONFIG_RD_XZ, CONFIG_RD_LZO,
CONFIG_USB_DWC2_HOST, CONFIG_EXT4_FS, CONFIG_EXT4_FS_POSIX_ACL

These options became obsolete:

CONFIG_RESOURCE_COUNTERS, CONFIG_SCSI_MULTI_LUN
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

versatile_defconfig has not been a reasonable default for a very long
time, there is very little work happening on this platform and it's
based on an old ARM926 CPU core.

This changes the default to multi_v7_defconfig, which is much more
relevant to anyone doing a build test on ARM, as it covers a wide
range of platforms.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Will Deacon <will.deacon@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Merge tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

The i.MX defconfig updates for 4.5:
- Drop CONFIG_SOC_LS1021A support, as it needs LPAE which is not
  available with imx_v6_v7_defconfig.
- Enable VF610_ADC, HDMI audio and PCI_MSI support

* tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: enable PCI_MSI
  ARM: imx_v6_v7_defconfig: Select HDMI audio support
  ARM: imx_v6_v7_defconfig: Select VF610_ADC
  ARM: imx_v6_v7_defconfig: Remove CONFIG_SOC_LS1021A
Signed-off-by: Olof Johansson <olof@lixom.net>

The rk808 supplies two clock outputs with one going back into the soc as
32kHz supply, supplying some core soc clocks with it. The system can boot
without it being present, but it is needed for example as source clock
for the thermal driver.
Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

This enables the newly added hardware crypto module
found for example on the rk3288.
Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

The io-domain driver is necessary to notify the soc about voltages changes
happening on supplying regulators. Probably the most important user right
now is the mmc tuning code, where the soc needs to get notified when the
voltage is dropped to the 1.8V point.

As this option is necessary to sucessfully tune UHS cards etc, it should
get built in.
Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

Defconfig additions for LPC18xx platform

Add LPC18xx EEPROM driver and MMA7455 IIO driver for the
accelerometer found on EA4357 Dev kit.

* tag 'lpc18xx_defconfig_for_4.5' of https://github.com/manabian/linux-lpc:
  ARM: configs: lpc18xx: enable EEPROM NVMEM driver
  ARM: configs: lpc18xx: enable mma7455 IIO driver
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'qcom-defconfig-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig

Qualcomm ARM Based defconfig Updates for v4.5

* Enable newly supported devices on Qualcomm platforms
* Enable HAVE_ARM_ARCH_TIMER

* tag 'qcom-defconfig-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: defconfig: qcom: Enable SSBI drivers
  ARM: defconfig: Update qcom_defconfig
  ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'renesas-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Renesas ARM Based SoC Defconfig Updates for v4.5

* multi_v7_defconfig and shmobile_defconfig:
  - Enable frame buffer console for armadillo800eva
  - Enable missing Renesas ARM support based on DTSes
  - Drop useless CONFIG_USB_RCAR_PHY=y
* shmobile_defconfig only:
  - Enable CONFIG_PRINTK_TIME

* tag 'renesas-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: Enable frame buffer console for armadillo800eva
  ARM: multi_v7_defconfig: Enable missing Renesas ARM support based on DTSes
  ARM: multi_v7_defconfig: Drop useless CONFIG_USB_RCAR_PHY=y
  ARM: shmobile: defconfig: Enable frame buffer console for armadillo800eva
  ARM: shmobile: defconfig: Enable missing support based on DTSes
  ARM: shmobile: defconfig: Drop useless CONFIG_USB_RCAR_PHY=y
  ARM: shmobile: defconfig: Enable CONFIG_PRINTK_TIME
Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/configs/multi_v7_defconfig

Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/defconfig

First defconfig pull-request for 4.5:
- a single patch to add watchdog drivers to sama5_defconfig

* tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/defconfig: enable watchdog drivers in sama5_defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>

ABB and PBIAS are internal LDO control regulators that are needed for
maintaining proper functionality of OMAP architecture SoCs. Enable the
same. PBIAS is already enabled, so just enable ABB regulator as well.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

Enable PMIC for AM437x platforms such as AM437x-sk similar to commit
a186cf10 ("ARM: omap2plus_defconfig: enable TPS65218 configs").
This allows multi_v7_defconfig to boot up on AM437x-sk platform.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'samsung-defconfig-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Defconfig (exynos and multi_v7) changes for Exynos based boards for 4.5:
1. Enable Maxim 8997 and 77693 family drivers (charger, extcon, LED,
   RTC, haptic/motor, regulator).
2. Build ChromeOS EC drivers as modules on multi_v7.
3. Enable drivers important for Exynos4210-based Universal C210 board.
4. Enable NFSv4 client.
5. On exynos_defconfig set some options to a value recommended
   by systemd. This also makes it more consistent with multi_v7.

* tag 'samsung-defconfig-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos_defconfig: Set recommended options for systemd
  ARM: exynos_defconfig: Enable NFSv4 client
  ARM: exynos_defconfig: Add drivers for Exynos4210 Universal C210 board
  ARM: multi_v7_defconfig: Build ChromeOS EC drivers as modules
  ARM: multi_v7_defconfig: Enable Maxim 77693 LED and haptic drivers
  ARM: multi_v7_defconfig: Enable Maxim 8997 family drivers
  ARM: exynos_defconfig: Enable Maxim 77693 LED and haptic drivers
  ARM: exynos_defconfig: Enable Maxim 8997 family drivers
Signed-off-by: Olof Johansson <olof@lixom.net>

Enable TPS65217 regulator to have rootfs in MMC for Beagle Bone's.
Suggested-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Afzal Mohammed <afzal.mohd.ma@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

Now that we have multiplatform support, let the RealView
defconfigs select all the RealView boards so we boot out of
the box like before. This updates both defconfigs.

Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Enable some ssbi drivers present on msm8660, msm8960 and apq8064
devices so that we fully exercise the devices present in the dts
files.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This enables smem, smd, rpm, regulators, pmic pinctrl and hwspinlock as
these platform features are now merged. It enables gpio-keys as this is
used by most boards and enables fhandle and cgroups, so we can boot
systemd.
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

In order to meet high performance an low power requirement for Rockchip
enable the power domain support. The patch also fixes a drm/kms issue,
driver deferring untils power-domains are available)
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Merge tag 'socfpga_defconfig_for_v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/defconfig

Merge "SoCFPGA defconfig update for v4.5" from Dinh Nguyen:
-Enable USB OTG dual-role and some cleanup by make savedefconfig

* tag 'socfpga_defconfig_for_v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm: socfpga_defconfig: enable USB dual-role and cleanup

This adds a few features that are available on some
or all of the RealView but never made it into the SMP
defconfig file:

- Full tickless idle
- High resolution timers
- Perf events and HW perf events from the PMU
- MTD AFS partition handling
- MTD ROM partition handling
- USB and ISP1760 USB driver
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

This adds a few features that are available on some
or all of the RealView but never made it into the defconfig
file:

- High-resolution timers
- Perf events and HW perf events from the PMU
- MTD AFS partition handling
- MTD ROM partition handling
- USB and ISP1760 USB driver
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

This updates the RealView SMP defconfig with the latest Kconfig
structure.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

This updates the RealView defconfig with the latest Kconfig
structure.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

This patch enables some drivers for LS1021A, such as
GIANFAR, WATCHDOG, AUDIO, QSPI, I2C, ESDHC, EDMA, FTM.
QorIQ Clock Framework and Ramdisk support is also enabled.
Signed-off-by: Alison Wang <alison.wang@freescale.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Merge "mvebu defconfig for 4.5 (part 2)" from Gregory CLEMENT:

- Reenable DSA in mvebu_v5_defconfig
- Update multi_v5_defconfig after adding Orion5x to multiarch

* tag 'mvebu-defconfig-4.5-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: update v5 defconfig for Orion5x machines
  ARM: mvebu: Reenable DSA in mvebu_v5_defconfig
  ARM: config: Add orion5x to multi_v5_defconfig
  ARM: config: Reenable DSA in multi_v5_defconfig
  ARM: config: Regenerate multi_v5_defconfig

Merge tag 'sunxi-defconfig-for-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig

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

A bunch of patches to enable new drivers related to Allwinner SoCs.

* tag 'sunxi-defconfig-for-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Clean up sunxi_defconfig
  ARM: sunxi: Really enable LRADC keys in sunxi_defconfig
  ARM: sunxi: Re-enable SID driver in sunxi_defconfig
  ARM: sunxi: Re-enable SID driver in multi_v7_defconfig
  ARM: multi_v7_defconfig: Enable RSB and AXP20X related drivers as modules
  ARM: sunxi_defconfig: Update MFD_AXP20X symbol and enable MFD_AXP20X_RSB

Merge "mvebu defconfig for 4.5 (part 1)" from Gregory CLEMENT:

update of mvebu_v5 defconfig with the addition of cpuidle

* tag 'mvebu-defconfig-4.5-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add Kirkwood cpuidle to defconfig
  ARM: mvebu: update v5 defconfig

Enable AT91SAM9X and SAMA5D4 watchdog drivers.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Enable NVMEM driver for NXP LPC18xx EEPROM, which can be found in
NXP LPC185x/3x and LPC435x/3x/2x/1x devices.
Signed-off-by: Ariel D'Alessandro <ariel@vanguardiasur.com.ar>
Signed-off-by: Joachim Eastwood <manabian@gmail.com>

MMA7455 is 3-axis accelerometer that can be found on
Embedded Artists' LPC4357 Developer's Kit.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>

Enabling the frame buffer device on r8a7740/armadillo800eva requires the
board staging code.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Enable all missing support, extracted from the various Renesas ARM DTSes
using linux-config-from-dt.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

The Renesas R-Car (Gen1) USB PHY driver (which is being removed) does
not support DT, and is thus useless in a generic ARM multi-platform
kernel.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Enabling the frame buffer device on armadillo800eva requires the board
staging code.
Also enable the frame buffer, so you will actually see output during
boot.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Enable all missing support, extracted from the various Renesas ARM DTSes
using linux-config-from-dt.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

The Renesas R-Car (Gen1) USB PHY driver (which is being removed) does
not support DT, and is thus useless in a Renesas ARM multi-platform
kernel.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>