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>

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>

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>

Enable timestamps for kernel log output to improve debugging.
You can always use "dmesg -t" to strip the timestamps.

Don't specify CONFIG_LOG_BUF_SHIFT=16 while we're at it.  There's a
reason the default in Kconfig is higher ;-)
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Now that Orion5x is part of the multiarch kernel, add it to
mvebu_v5_defconfig.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

DSA now depends on switchdev. Enable it, and re-enable DSA and its
drivers, which were removed when mvebu_v5_defconfig was regenerated.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

Now that Orion5x is part of the v5 multiarch kernel enable it in the
multi_v5_defconfig.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

DSA now depends on switchdev. Enable it, and re-enable DSA and its
drivers, which were removed when multi_v5_defconfig was regenerated.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

Dues the Kconfig changes, multi_v5_defconfig needs regenerating.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

Enable USB OTG dual-role and a bit of clean up by using make savedefconfig.
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>

The Honami device does not boot due to the lack of pinctrl support
compiled in with the multi_v7_defconfig. This patch correct this and
enables coincell, sdhci, smsm, smp2p and wcnss_ctrl as well, all found
on a variety of Qualcomm boards.
Reported-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Tested-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>

This patch enables the QCOM SPMI and PMIC related drivers that are now
required to boot some supported devices.
Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Set following options to a value recommended by systemd (which also
matches the multi_v7 deconfig):
1. Enable AUTOFS4_FS - for systemd.automount [0];
2. Enable BLK_DEV_BSG - SG v4 for recend udev [0][1];
3. Disable UEVENT_HELPER_PATH - legacy hook for hotplug, forked for each
   uevent, slows down booting [0];

[0] http://cgit.freedesktop.org/systemd/systemd/tree/README
[1] http://patchwork.ozlabs.org/patch/47921/Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

The Kirkwood v5 platforms need their CPUIDLE driver, so put it
into the defconfig.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

This just regenerates the v5 mvebu defconfig with the latest
defaults so as to avoid too much fuzz when applying patches to
it.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

NFS client is already enabled (NFS_FS) and by default it enables clients
for version 2 and 3. Enable explicitly the version 4 client to utilize
the newer protocol.

The NFS client is especially useful for testing kernel in automated
environments (network boot with network file system).
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

Pull nouveau and radeon fixes from Dave Airlie:
 "Just some nouveau and radeon/amdgpu fixes.

  The nouveau fixes look large as the firmware context files are
  regenerated, but the actual change is quite small"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: make some dpm errors debug only
  drm/nouveau/volt/pwm/gk104: fix an off-by-one resulting in the voltage not being set
  drm/nouveau/nvif: allow userspace access to its own client object
  drm/nouveau/gr/gf100-: fix oops when calling zbc methods
  drm/nouveau/gr/gf117-: assume no PPC if NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK is zero
  drm/nouveau/gr/gf117-: read NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK from correct GPC
  drm/nouveau/gr/gf100-: split out per-gpc address calculation macro
  drm/nouveau/bios: return actual size of the buffer retrieved via _ROM
  drm/nouveau/instmem: protect instobj list with a spinlock
  drm/nouveau/pci: enable c800 magic for some unknown Samsung laptop
  drm/nouveau/pci: enable c800 magic for Clevo P157SM
  drm/radeon: make rv770_set_sw_state failures non-fatal
  drm/amdgpu: move dependency handling out of atomic section v2
  drm/amdgpu: optimize scheduler fence handling
  drm/amdgpu: remove vm->mutex
  drm/amdgpu: add mutex for ba_va->valids/invalids
  drm/amdgpu: adapt vce session create interface changes
  drm/amdgpu: vce use multiple cache surface starting from stoney
  drm/amdgpu: reset vce trap interrupt flag

Pull RTC fixes from Alexandre Belloni:
 "Two fixes for the ds1307 alarm and wakeup"

* tag 'rtc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: ds1307: fix alarm reading at probe time
  rtc: ds1307: fix kernel splat due to wakeup irq handling