This patch updates the multi_v7_defconfig with the CONFIG_* needed by
the just added Meson anch. It also adds a new defconfig specifically for
the Meson SoCs.
Signed-off-by: Carlo Caione <carlo@caione.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

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

Merge "Fourth Round of Renesas ARM Based SoC Defconfig Updates for v3.18" from Simon Horman:

Fourth Round of Renesas ARM Based SoC Defconfig Updates for v3.18

* Enable r8a7794 SoC in shmobile_defconfig

* tag 'renesas-defconfig4-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>

Enable Mediatek platform support for multi_v7_defconfig.
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge "ARM: mvebu: defconfig changes for v3.18" from Jason Cooper:

mvebu defconfig changes for v3.18

 - mvebu_v7
    - add LED class
    - add gpio-fan
    - add 'useful' options

* tag 'mvebu-defconfig-3.18' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add gpio-fan to mvebu_v7_defconfig
  ARM: mvebu: add LED class support built-in in mvebu_v7_defconfig
  ARM: mvebu: update v7 defconfig with useful options
Signed-off-by: Olof Johansson <olof@lixom.net>

Since one of the platforms (Armada 370 RD) is now using the gpio-fan
driver, it makes sense to enable it in mvebu_v7_defconfig.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1410429419-29820-5-git-send-email-thomas.petazzoni@free-electrons.comSigned-off-by: Jason Cooper <jason@lakedaemon.net>

For some reason, while all other features are configured built-in, the
LED class support was configured as a module in
mvebu_v7_defconfig. This commit makes it consistent with the other
options, by making this feature built-in.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1410429419-29820-4-git-send-email-thomas.petazzoni@free-electrons.comSigned-off-by: Jason Cooper <jason@lakedaemon.net>

Support for the r8a7794 was recently added.
Enable it in the shmobile_defconfig to increase build coverage.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Pull "ARM: LPC32xx: Device tree updates" from Roland Stigge:

This enables ubifs in the lpc32xx defconfig.

* 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: defconfig update

This patch adds UBI+UBIFS to LPC32xx defconfig.
Signed-off-by: Roland Stigge <stigge@antcom.de>

Pull "First batch of AT91 defconfig update for 3.18" from Nicolas Ferre:

- a dependency needed for SPI flash
- enable sound on DT platforms
- cleanup of current defconfigs:
  - addition of new PWM subsystem and related drivers
  - addition of ADC/touchscreen, watchdog or USB depending on the SoC
  - addition of power/reset drivers activated during this development cycle
  - removal of obsolete config options
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'at91-defconfig' of git://github.com/at91linux/linux-at91:
  ARM: at91: sama5: update defconfig
  ARM: at91: at91sam9rl: update defconfig
  ARM: at91: at91sam9g45: update defconfig
  ARM: at91: at91sam9263: update defconfig
  ARM: at91: at91sam9261_9g10: update defconfig
  ARM: at91: at91sam9260_9g20: update defconfig
  ARM: at91: at91_dt: update defconfig
  ARM: at91/sama5_defconfig: enable sound support
  ARM: at91/at91_dt_defconfig: enable sound support
  ARM: at91: add MTD_SPI_NOR (new dependency for M25P80)

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

Pull "Renesas ARM Based SoC Defconfig Updates for v3.18" from Simon Horman:

Third Round of Renesas ARM Based SoC Defconfig Updates for v3.18

* Enable Armadillo 800 EVA board in multiplatform defconfig

Second Round Of Renesas ARM Based SoC Defconfig Updates For v3.18

* Do not disable SUSPEND in Bockw defconfig
  - Suspend to ram is now supported

Renesas ARM Based SoC Defconfig Updates for v3.18

* Enable initrd in shmobile defconfig
* Enable missing hardware support in shmobile and several board defconfigs
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'renesas-defconfig3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable Armadillo 800 EVA board in multiplatform defconfig
  ARM: shmobile: bockw: Do not disable SUSPEND in defconfig
  ARM: shmobile: defconfig: enable initrd
  ARM: shmobile: marzen_defconfig: Enable missing hardware support
  ARM: shmobile: lager_defconfig: Enable missing hardware support
  ARM: shmobile: kzm9g_defconfig: Enable missing hardware support
  ARM: shmobile: koelsch_defconfig: Enable missing hardware support
  ARM: shmobile: bockw_defconfig: Enable missing hardware support
  ARM: shmobile: ape6evm_defconfig: Enable missing hardware support
  ARM: shmobile: shmobile_defconfig: Enable missing hardware support

Many boards share the cpufreq-cpu0 driver meaning that if we enable it in
multi_v7_defconfig we can get a reasonable amount of functional utility for
systems and test coverage for a fairly small increase in kernel size.
Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

The virtual consumer is a test device intended to be used while developing
regulator drivers, it should never be used in production. Remove it from
all defconfigs to avoid confusion among users.
Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Update defconfig, adding:
 - PWM support using the generic framework
 - generic PWM leds
 - Power/reset

and removing deprecated config options.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Update defconfig, adding:
 - USB gadget
 - PWM support using the generic framework
 - generic PWM leds
 - LEDs triggers
 - Power/reset

and removing deprecated config options.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Update defconfig, adding:
 - PWM support using the generic framework
 - generic PWM leds
 - Power/reset
 - Watchdog

and removing deprecated config options.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Update defconfig, adding:
 - PWM support using the generic framework
 - generic PWM leds
 - Power/reset

and removing deprecated config options.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Update defconfig, adding power/reset and removing deprecated config options.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Update defconfig, adding:
 - ADC/touchscreen
 - Power/reset

and removing deprecated config options.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Update defconfig, adding:
 - ADC/touchscreen
 - PWM support using the generic framework
 - generic PWM leds
 - Power/reset

and removing deprecated config options.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

As sound support depends on ssc, i2c and dma, so also enable them.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

This defconfig contains the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.

At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

This is a squashed series from Soren:

"I went through the defconfig and searched for Zynq drivers. The result
is this series of patches. The first few are all for Zynq and pretty
much straight forward. The second half is mostly soft-IP, I think. That
soft-IP works with Zynq devices, but I'm not sure whether those should
go into the multi_v7 defconfig."

Soren Brinkmann (11):
  ARM: multi_v7_defconfig: Enable Zynq cpuidle driver
  ARM: multi_v7_defconfig: Enable Zynq/Xilinx CAN driver
  ARM: multi_v7_defconfig: Enable XADC driver
  ARM: multi_v7_defconfig: Enable Zynq SPI driver
  ARM: multi_v7_defconfig: Enable Zynq GPIO driver
  ARM: multi_v7_defconfig: Enable Xilinx I2C driver
  ARM: multi_v7_defconfig: Enable Xilinx SPI driver
  ARM: multi_v7_defconfig: Enable Xilinx GPIO driver
  ARM: multi_v7_defconfig: Enable Xilinx VDMA driver
  ARM: multi_v7_defconfig: Enable Xilinx emaclite driver
  ARM: multi_v7_defconfig: Enable Xilinx watchdog timer
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
[olof: Added commit message from series envelope email, squashed to
one patch]
Signed-off-by: Olof Johansson <olof@lixom.net>

Turn on a bunch of options to make my cubox bootable/usable:

PRINTK_TIME
EXT4 (and turn off 2/3 since 4 can mount all filesystems)
MV643XX_ETH for Dove
SDHCI for Dove
DEVTMPFS
PACKET and UNIX protocol support

Much of the other churn is just due to reorderings in the defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Link: https://lkml.kernel.org/r/1408729202-11064-1-git-send-email-olof@lixom.netSigned-off-by: Jason Cooper <jason@lakedaemon.net>

As of "ARM: shmobile: r8a7778: Add missing call to shmobile_init_late()"
suspend-to-ram is now supported on the r8a7778 SoC and thus the bockw
board.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Enable initrd support.
Signed-off-by: Kevin Hilman <khilman@linaro.org>
[horms+renesas@verge.net.au: dropped enabling atag dtb compat]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Based on the DTS
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Based on the DTS

Notes:
  - MTD_SPI_NOR is a dependency for MTD_M25P80 since commit
    03e296f6 ("mtd: m25p80: use the SPI
    nor framework") and commit e43b2061
    ("mtd: spi-nor: shorten Kconfig naming").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Based on the DTS
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Based on the DTS

Notes:
  - MTD_SPI_NOR is a dependency for MTD_M25P80 since commit
    03e296f6 ("mtd: m25p80: use the SPI
    nor framework") and commit e43b2061
    ("mtd: spi-nor: shorten Kconfig naming").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Based on the DTS

Notes:
  - MTD_SPI_NOR is a dependency for MTD_M25P80 since commit
    03e296f6 ("mtd: m25p80: use the SPI
    nor framework") and commit e43b2061
    ("mtd: spi-nor: shorten Kconfig naming").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Based on the DTS
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Based on the DTSes

Notes:
  - MTD_SPI_NOR is a dependency for MTD_M25P80 since commit
    03e296f6 ("mtd: m25p80: use the SPI
    nor framework") and commit e43b2061
    ("mtd: spi-nor: shorten Kconfig naming"),
  - I2C_RIIC was enabled in the old genmai_defconfig.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Pull x86 platform driver updates from Matthew Garrett:
 "A moderate number of changes, but nothing awfully significant.

  A lot of const cleanups, some reworking and additions to the rfkill
  quirks in the asus driver, a new driver for generating falling laptop
  events on Toshibas and some misc fixes.

  Maybe vendors have stopped inventing things"

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (41 commits)
  platform/x86: Enable build support for toshiba_haps
  Documentation: Add file about toshiba_haps module
  platform/x86: Toshiba HDD Active Protection Sensor
  asus-nb-wmi: Add wapf4 quirk for the U32U
  alienware-wmi: make hdmi_mux enabled on case-by-case basis
  ideapad-laptop: Constify DMI table and other r/o variables
  asus-nb-wmi.c: Rename x401u quirk to wapf4
  compal-laptop: correct invalid hwmon name
  toshiba_acpi: Add Qosmio X75-A to the alt keymap dmi list
  toshiba_acpi: Add extra check to backlight code
  Fix log message about future removal of interface
  ideapad-laptop: Disable touchpad interface on Yoga models
  asus-nb-wmi: Add wapf4 quirk for the X550CC
  intel_ips: Make ips_mcp_limits variables static
  thinkpad_acpi: Mark volume_alsa_control_{vol,mute} as __initdata
  fujitsu-laptop: Mark fujitsu_dmi_table[] DMI table as __initconst
  hp-wmi: Add missing __init annotations to initialization code
  hp_accel: Constify ACPI and DMI tables
  fujitsu-tablet: Mark DMI callbacks as __init code
  dell-laptop: Mark dell_quirks[] DMI table as __initconst
  ...

Pull idle update from Len Brown:
 "Two Intel-platform-specific updates to intel_idle, and a cosmetic
  tweak to the turbostat utility"

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: tweak whitespace in output format
  intel_idle: Broadwell support
  intel_idle: Disable Baytrail Core and Module C6 auto-demotion

Pull module fix from Rusty Russell:
 "Nasty potential bug if someone uses a known module param with an
  invalid value (we don't fail unknown module params any more, just
  warn)"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  module: Clean up ro/nx after early module load failures

Pull virtio-rng update from Amit Shah:
 "Add derating factor for use by hwrng core

  Sending directly to you with the commit log changes Ted Ts'o pointed
  out.  Not sure if Rusty's back after his travel, but this already has
  his s-o-b"

* 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio:
  virtio: rng: add derating factor for use by hwrng core