Commit 94ea9c7a579f ("lib, switch CONFIG_PRINTK_TIME to int") changes
the type of CONFIG_PRINTK_TIME and adapts all existing defconfig files,
while we add two new defconfig files with d0bc3483 ("arm/configs:
Add Aspeed defconfig"), with the old type.

This changes the two new defconfig files to match the other ones.
As a result, we get harmless warnings for the arm-soc defconfig
branch by itself, but everything will work when 4.7-rc1 is out.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

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

Merge "Second batch of defconfig" from Nicolas Ferre:

- sama5_defconfig: update to support easy use of systemd userspace

* tag 'at91-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/defconfig: sama5: add CONFIG_FHANDLE
  ARM: at91: sama5: Update defconfig
  ARM: multi_v7_defconfig: add the Atmel sama5d2-compatible ADC driver
  ARM: multi_v7_defconfig: add the Atmel Audio microphone interface PDMIC
  ARM: multi_v7_defconfig: add Atmel ISI (Image Sensor Interface) driver
  ARM: multi_v7_defconfig: add Atmel watchdog timers
  ARM: multi_v7_defconfig: add HLCDC drivers as modules
  ARM: at91/defconfig: add PDMIC driver to sama5_defconfig
  ARM: at91/defconfig: add HLCDC driver to sama5_defconfig
  ARM: at91/defconfig: add the HDMA controller to sama5_defconfig

Merge "aspeed defconfig for 4.7" from Joel Stanley:

This adds configurations used for testing Aspeed BMC SoCs, as well as adding
the v5 part to the multi defconfig.

* tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux:
  arm/configs: Add Aspeed defconfig
  arm/configs/multi_v5: Add Aspeed ast2400

Merge tag 'ux500-defconfig-armsoc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/defconfig

Merge "Ux500 defconfig update for v4.7" from Linus Walleij:

- Remove the unused MACH_UX500_DT option from the multi_v7 defconfig
- Remove staging driver from u8500_defconfig
- Update sensor support in u8500_defconfig

* tag 'ux500-defconfig-armsoc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: u8500_defconfig: update sensor config
  ARM: u8500_defconfig: remove staging from defconfig
  ARM: multi_v7_defconfig: Remove unused Kconfig option MACH_UX500_DT

The Ux500 is using buffered IIO as the sensors support
IRQs. The BH1780 ambient light sensor was added to IIO,
so disable the old misc driver and activate the driver
in IIO.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Ux500 was enabling the staging drivers due to the RMI4
touchscreen driver, this is now properly upstream, so drop
this and the dead symbol for the old RMI4 hack from
the defconfig.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

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

Merge "i.MX defconfig updates for 4.7" from Shawn Guo:

 - Update multi_v5_defconfig for i.MX21/27 and systemd support
 - Update imx_v6_v7_defconfig to support devices found on various i.MX6
   board: FT5x06 and TSC2004 touch, I2C GPIO, MICREL PHY and M41T80 RTC

* tag 'imx-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: add CONFIG_MICREL_PHY
  ARM: imx_v6_v7_defconfig: add CONFIG_I2C_GPIO
  ARM: multi_v5_defconfig: Enable recommended options for systemd
  ARM: multi_v5_defconfig: Enable support for MX21/MX27
  ARM: imx_v6_v7_defconfig: add CONFIG_RTC_DRV_M41T80
  ARM: imx_v6_v7_defconfig: add CONFIG_I2C_MUX_GPIO
  ARM: imx_v6_v7_defconfig: add FT5x06 and TSC2004 touch support

Merge tag 'tegra-for-4.7-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig

Merge "ARM: tegra: Default configuration updates for v4.7-rc1" from Thierry Reding:

Enable the XUSB pad controller and XUSB controller drivers on the Tegra
and multi-v7 default configurations.

* tag 'tegra-for-4.7-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: multi_v7: Enable Tegra XUSB controller in defconfig
  ARM: tegra: Enable XUSB controller in defconfig

Merge tag 'davinci-for-v4.7/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig

Merge "DaVinci defconfig updates for v4.7" from Sekhar Nori:

Some defconfig updates to support systemd
based filesystems, SPI NOR and GPIO sysfs
entries.

* tag 'davinci-for-v4.7/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: enable SPI and NOR as modules
  ARM: davinci_all_defconfig: support systemd
  ARM: davinci_all_defconfig: enable GPIO_SYSFS

CONFIG_FHANDLE is listed as a mandatory kernel option for systemd. So
explicitly enable it to allow easy use of systemd userspace.
Reported-by: Marek Vasut <marex@denx.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Signed-off-by: Joel Stanley <joel@jms.id.au>

This adds the Aspeed ast2400 BMC SoC to the build.

The SoC has six UARTs so we need to enable the appropriate options for
SERIAL_8250
Signed-off-by: Joel Stanley <joel@jms.id.au>

Enable CGROUPS support, so we can boot userspace that uses systemd on
top of kernel configured using this defconfig. The systemd userspace
depends on cgroups and without them, it dies in mysterious ways.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

The driver for Micrel PHYs is required for the Apalis iMX6 module
plugged into a Ixora carrier board featuring an on-module Micrel
KSZ9031 Gigabit PHY.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

The GPIO-based bitbanging I2C driver is required to make HDMI work on
the Apalis iMX6 module plugged into a Ixora carrier board featuring a
DDC channel to read a screen's EDID being hooked up to regular GPIOs.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

Enable the XUSB pad controller and XUSB controller (implementing an XHCI
interface) in the multi_v7 default configuration.

The XUSB pad controller is built-in because it is needed by PCIe, which
in turn provides the onboard ethernet used for network boot on a Jetson
TK1.
Signed-off-by: Thierry Reding <treding@nvidia.com>

Enable the XUSB pad controller and XUSB controller (implementing an XHCI
interface) in the Tegra default configuration.
Signed-off-by: Thierry Reding <treding@nvidia.com>

Merge tag 'omap-for-v4.7/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig

Merge "Defconfig changes for omap2plus_defconfig for v4.7 merge window" from Tony Lindgren:

Mostly enable drivers used on various boards as loadable modules
where possible. Also one warning fix related to RXKAD changes
heading to v4.7. And run make save_defconfig to shrink down the
size a bit.

* tag 'omap-for-v4.7/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2plus_defconfig: Enable PWM and ir-rx51 as loadable modules
  ARM: omap2plus_defconfig: Enable twl6030 USB phy as loadable module
  ARM: omap2plus_defconfig: Fix warning due invalid RXKAD symbol value
  ARM: omap2plus_defconfig: Update with make savedefconfig
  ARM: omap2plus_defconfig: Enable MDIO Bus/PHY emulation support
  ARM: omap2plus_defconfig: Enable DP83867 support
  ARM: omap2plus_defconfig: Enable GPIO_TPIC2810

Merge "NXP LPC32xx defconfig updates for v4.7" from Vladimir Zapolskiy:

This includes savedefconfig update of lpc32xx_defconfig, which removes
a number of outdated config options, plus ARM PrimeCell PL17x memory
controller driver is enabled by default now, on LPC32xx boards the
controller is commonly used to access SDRAM and NOR.

* tag 'lpc32xx-defconfig-4.7' of git://github.com/vzapolskiy/linux-lpc32xx:
  ARM: LPC32xx: add PL175 memory controller driver to defconfig
  ARM: LPC32xx: defconfig update

These are available on n900.
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add the new sama5d2-compatible ADC driver as a module.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Add the Atmel Pulse Density Modulation Interface Controller (PDMIC) driver
as a module. It's used by sama5d2 SoC for instance.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Add the Atmel Image Sensor Interface (ISI) VIDEO driver as a module.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Add both Atmel watchdog timers to the multi_v7_defconfig. They are added
as part of the kernel because it's a core piece of the system.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Add the HLCDC drivers to multi_v7_defconfig.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Add Pulse Density Modulation Interface Controller (PDMIC) driver compilation
for sama5 default configuration. Is used by sama5d2 SoC for instance.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Add the LCD DRM driver with all its dependencies:
- the MFD driver
- the backlight PWM
- the simple panel driver

Remove the CONFIG_FB as it is not needed on any sama5 device.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Selection of the HDMAC option is now needed to allow some sama5 devices
to have the DMA driver compiled and available.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

This is in use on omap4 boards.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Commit 648af7fc ("rxrpc: Absorb the rxkad security module") changed
the RXKAD Kconfig symbol from tristate to boolean but the commit didn't
update the omap2plus_defconfig that was enabling CONFIG_RXKAD as module.

This leads to the following warning when using the omap2plus_defconfig:

arch/arm/configs/omap2plus_defconfig:112:warning: symbol value 'm' invalid for RXKAD
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

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

Merge "Renesas ARM Based SoC Pci Defconfig Updates for v4.7" from Simon Horman:

* Remove Gen2 designation from Kconfig for R-Car PCIE driver

* tag 'renesas-pci-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  PCI: rcar-pcie: Remove Gen2 designation from Kconfig

This patch adds a new config for MPS2 platform.
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Merge tag 'keystone_config_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig

Merge "ARM: Keystone HOTPLUG and PSCI config update for 4.7" from Santosh Shilimkar

* tag 'keystone_config_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: configs: keystone: Add CPU Hotplug related options

Merge "This pull request contains defconfig changes for Broadcom ARM-based SoCs"
from Florian Fainelli:

- Eric enables more BCM2835 peripherals in multi_v7_defconfig: watchdog, I2S,
  switches from the sdhci-bcm2835 to the sdhci-iproc driver, DWC2 USB controller

- Eric also enables more BCM2835 peripherals in bcm2835_defconfig: VC4, NFS root
  Power Management support, switching sdhci-bcm2835 for sdhci-iproc

* tag 'arm-soc/for-4.7/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: bcm2835: Enable NFS root support.
  ARM: bcm2835: Enable the VC4 graphics driver in the defconfig
  ARM: bcm2835: Enable CONFIG_PM.
  ARM: bcm2835: Switch BCM2835 to sdhci-iproc.c for MMC
  ARM: multi_v7_defconfig: Build in DWC2 USB support
  ARM: multi_v7_defconfig: Switch BCM2835 to sdhci-iproc.c for MMC
  ARM: multi_v7_defconfig: Add more BCM2835 support

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

- Use the new cryto engine(mv_cesa) in the mvebu and multi-arm
  defcongig files
- Attach mvebu_*_defconfig to the mvebu maintainers

* tag 'mvebu-defconfig-4.7-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu_v5_defconfig: Switching to the new Marvell's cryptographic engine driver
  ARM: multi_v7_defconfig: Enabling the new Marvell's cryptographic engine driver
  MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to relevant maintainers
  ARM: mvebu_v7_defconfig: Enabling the new Marvell's cryptographic engine driver

This NAND controller device is used on UniPhier SoCs (and I know
it is also used on SoC FPGA).
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

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

Merge "Defconfig (exynos and multi_v7) changes for Exynos based boards for v4.7" from Krzysztof Kozłowski:

1. Enable additional drivers for Trats2 board (Exynos4412).
2. Enable CPUFreq governors as modules.

* tag 'samsung-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: multi_v7_defconfig: Enable CPUFreq governors as modules
  ARM: exynos_defconfig: Enable CPUFreq governors as modules
  ARM: exynos_defconfig: Enable Trats2 audio codec, touchscreen and sensors

Enable SPI driver and SPI NOR flash support as modules.

Tested with SPI NOR flash on DA850-EVM.  Basic boot test only to confirm
NOR flash device detection.
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

CONFIG_FHANDLE is required by systemd[1], which is the
default init system in more and more distributions.
So lets enable it for DaVinci platforms as well.

While at it, remove stale entry CONFIG_INOTIFY=y

[1] https://github.com/systemd/systemd/blob/master/README#L37Acked-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>