Merge tag 'omap-for-v4.2/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "Device tree related changes for omaps" from Tony Lindgren:

- Configure MMC data lines 4..8 for 1.8V IO on boards that
  are using them as GPIOs instead of MMC data lines

- Add support for Baltos IR5221

- Add device tree support for LogicPD Torpedo devkit

- Add 3717 core pinctrl region

- Add gta04 1w and GSM audio support

- Add wilink and ov2659 support for am437x-gp-evm

- Add am335x-evm bluetooth and mmc3 support

- Enable omap5-uevm uart wakeup interrupt

- Enable I2C2 on BeagleBone as it's used for the capes

- Use defines for LDP GPIO keys

* tag 'omap-for-v4.2/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-evm: add mmc3 and wlan definitions to dts
  ARM: dts: Enable SDIO card interrupt for 37xx-evm
  ARM: dts: Fix ldp gpio keys to use defines
  ARM: dts: Beaglebone i2c definitions
  ARM: dts: am437x-gp-evm: add DT nodes for ov2659 sensor
  ARM: dts: add DTS for Baltos IR5221
  ARM: dts: omap5-uevm: Add Uart wakeup interrupt
  ARM: dts: omap3-gta04: Add GSM audio support
  ARM: dts: am335x-evm: add bluetooth support
  ARM: dts: am437x-gp-evm: add wilink8 support
  ARM: dts: omap3-gta04: Add hdqw1 support
  ARM: dts: add core2 padconf region for am3517
  ARM: dts: Add minimal support for LogicPD Torpedo DM3730 devkit
  ARM: OMAP3: Add support for configuring MMC pins as GPIO pins

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

Merge "Third batch of DT changes for 4.2" from Nicolas Ferre:

- USB host clock refine following changes in drivers
- one little fix for usart pinctrl

* tag 'at91-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: remove useless usb clock
  ARM: at91/dt: remove useless uhpck clock references from ehci defintions
  USB: atmel: update DT bindings documentation
  ARM: at91/dt: at91sam9x5: fix usart1 sck pin definition

Merge tag 'v4.2-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "ARM: rockchip: dts relicensing for 4.2" from Heiko Stuebner:

Relicense all Rockchip-related devicetree files to the GPL2/X11 combo.
I've now finally aquired necessary Acks from all contributors.

* tag 'v4.2-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: relicense rk3288-evb* under GPLv2/X11
  ARM: dts: rockchip: relicense rk3288.dtsi under GPLv2/X11
  ARM: dts: rockchip: relicense rk3188-radxarock.dts under GPLv2/X11
  ARM: dts: rockchip: relicense rk3066a-bqcurie2.dts under GPLv2/X11
  ARM: dts: rockchip: relicense rk3288-thermal.dtsi under GPLv2/X11
  ARM: dts: rockchip: relicense rk3188.dtsi under GPLv2/X11
  ARM: dts: rockchip: relicense rk3066a.dtsi under GPLv2/X11
  ARM: dts: rockchip: relicense rk3xxx.dtsi under GPLv2/X11

The ohci driver now calls clk_set_rate on the uhpck clock (which forwards
set_rate requests to its parent: the usb clock).
Remove useless references to usb clocks from ohci definitions.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

The uhpck is useless for High-Speed communications, remove the reference
to this clock in all ehci definitions.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Add documentation for the missing clocks, clock-names, reg and interrupts
properties.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

This includes the wlan regulator, pinmux, DMA
and wlcore bindings.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Eyal Reizer <eyalr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This allows to use the MMC1 slot with SDIO cards.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Fix ldp gpio keys to use defines.
Signed-off-by: Tony Lindgren <tony@atomide.com>

This adds an initial device tree to run Linux on the Cortex-M4 on
the Vybrid based Colibri VF61 module.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Merge "Berlin DT changes for v4.2" from Sebastian Hesselbarth:
- GPLv2/X11 dual licensing
- Mark Berlin DT bindings as unstable
- Updated binding documentation for reworked
  chip/system ctrl nodes

* tag 'berlin-dt-4.2-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  Documentation: bindings: update the berlin chip and system ctrl doc
  Documentation: bindings: move the Berlin clock documentation
  Documentation: bindings: move the Berlin pinctrl documentation
  Documentation: bindings: move the Berlin reset documentation
  Documentation: bindings: update the Berlin controllers documentation
  Documentation: bindings: berlin: consider our dt bindings as unstable
  ARM: dts: berlin: relicense the BG2CD Google Chromecast dts under GPLv2/X11
  ARM: dts: berlin: relicense the berlin2cd dtsi under GPLv2/X11
  ARM: dts: berlin: relicense the BG2 Sony NSZ-GS7 dts under GPLv2/X11
  ARM: dts: berlin: relicense the berlin2 dtsi under GPLv2/X11
  ARM: dts: berlin: relicense the BG2Q Marvell DMP dts under GPLv2/X11
  ARM: dts: berlin: relicense the berlin2q dtsi under GPLv2/X11

The beaglebone family of boards contain two I2C busses enabled.
The first one with a baseboard identification EEPROM and a
cape I2C bus.
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

this patch does the following:
1: adds DT node for fixed oscillator.
2: adds DT node entries for ov2659 sensor
3: adds remote-endpoint entry for VPFE.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

This device is an industrial PC based on
AM335x SoC.

[ balbi@ti.com : updated to fit current mainline ]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

UART3 wakeup takes place with iodaisy chain. enable the wakeup pin.
Reported-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
[tony@atomide.com: tabify uart pins properly while at it]
Signed-off-by: Tony Lindgren <tony@atomide.com>

Add voice audio card which is used for telephony on gta04 board.
gtm601 codec is UMTS modem with pcm interface which get samples from
microphone and provide data from other party side. Use simple audio card
to describe audio card.
Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

uart1 is used for connecting to wilink8 bluetooth subsystem.
add the needed muxes and definitions.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Eyal Reizer <eyalr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

enable mmc3 used for wlan and uart3 used for bluetooth

configure the gpios used for wlan and bluetooth controls

add fixed voltage regulator used for wlan power control
Signed-off-by: Eyal Reizer <eyalr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Enable omap-hdq for battery fuel gauge access.
Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

According to the technical reference manual for AM35xx system
controller module (SCM) PADCONFS core registers are divided in two
regions: 0x48002030..0x48002268 and 0x480025d8..0x480025fc.
First region is the same for all omap3 SoC and is described in omap3.dtsi.
The second region is the same as in omap34xx (see omap34xx.dtsi)
and omap35xx. The patch adds missing description for the second region.
This patch was tested on AM3517.
Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

The LogicPD Torpedo DM3730 devkit consists of a base board and
two processor boards. One of the processor boards has a WLAN and
the other one does not.

Let's set up basic dts file so we can move to device tree only
based booting over next few merge windows. So far I've tested
that UARTs, MMC1, USB OTG, smsc911x, and basic PM support works.

Note that the wireless support in kernel for wl1283 seems to be
broken, it tries to load wl127x-nvs.bin instead of wl128x-nvs.bin
with firmware.

Cc: Tim Nordell <tim.nordell@logicpd.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Some devices are using the MMC1 pins 4..8 as GPIO pins, and in
this case they need to be configured for 1.8V IO voltage if not
done by the bootloader as otherwise some devices like smsc911x
won't work properly.

Let's also make sure this register is saved and restored for
idle.

Cc: Tim Nordell <tim.nordell@logicpd.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

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

Merge "Second batch of DT changes for 4.2:" from Nicolas Ferre:
- sama5d4: more peripherals: usarts, uarts, spi, pioD access
- sama5d3: phy address for gmac
- change NFC register map
- regulator additions for the sd/mmc

* tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: sama5d4 xplained: add regulators for v(q)mmc1 supplies
  ARM: at91/dt: sama5d3 xplained: add fixed regulator for vmmc0
  ARM: at91/dt: sama5d3 xplained: add mmc0 vqmmc entry
  ARM: at91/dt: sama5d3 xplained: fill in mmc1 and set it to disabled
  ARM: at91/dt: sama5: reduce the NFC command register map
  ARM: at91/dt: sama5d4: update pinctrl ranges
  ARM: at91/dt: sama5d3 xplained: add phy address for macb0
  ARM: at91/dt: sama5d4 xplained: add spi1 on j14 connector
  ARM: at91/dt: sama5d4: add spi1, spi2 dt nodes
  ARM: at91/dt: sama5d4: add uart0, uart1 dt nodes
  ARM: at91/dt: sama5d4: add usart0, usart1 dt nodes

SCK1 pin is pioC 29. Comment was okay.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Add vcc_mmc1 fixed regulator to remove the 'no vmmc regulator found' warning
when probing the mmc1 device.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Add fixed regulator for vmmc0 and attach the vmmc for it to the mmc0
node on the SAM5D3 Xplained board. This will remove the following
warning from the kernel:

atmel_mci f0000000.mmc: No vmmc regulator found

Note, atmel_defconfig will need fixed regulator support enabled if this
is to be used properly.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
[use a fixed regulator instead of gpio one]
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

The SAM5D3 Xplained device tree is missing the vqmmc node which is
tied to 3.3V on the board. Add this to avoid the kernel warning that
there is no vqmmc node.

atmel_mci f0000000.mmc: No vqmmc regulator found
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

The mmc1 channel is not populated on the SAM5D3 Xplained board, however
it is enabled and therefore the driver is attaching to it.

The node configuration for mmc1 is missing, so add an mmc1 node in the
device tree and set its status to disabled. Also add the vmmc and the
necessary slot configuration if this node were enabled to avoid the following
warnings from the driver:

atmel_mci f8000000.mmc: No vmmc regulator found
atmel_mci f8000000.mmc: No vqmmc regulator found
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

commit 111573cc ("mtd: atmel_nand: check NFC busy flag by HSMC_SR
instead of NFC cmd regs")
check NFC busy by nfc SR instead of NFC cmd regs. So we don't need to
map NFC cmd registers to include NFCBUSY bit.
That means we only need map 0x08000000 instead of 0x10000000 for NFC
cmd regs.

This patch reduce the NFC cmd regs map for sama5d3 & sama5d4.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Update the pinctrl ranges property to support pioD controller whose
mapping is not contiguous with other pio controllers. Without this
update, getting resource will fail, then pinctrl probe will fail too
because there is a missing pio controller.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Specify the phy address on macb0 node aka GEM.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Route SPI1 on the Arduino "in the middle" spi connector.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Add sama5d4 spi1, spi2 dt nodes & pinctrl.
Signed-off-by: Suchang Ko <suchangko@samul.kr>
[nicolas.ferre@atmel.com: split patch, reorder & whitespace fixes]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Now that the rework to have one sub-node per device in the chip and
system controllers is done, their dedicated compatible can be removed.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

The Berlin clock documentation was part of the Marvell Berlin SoC
documentation because the Berlin clock configuration was inside the
chip controller. With the recent rework of the chip and system
controller handling (now all sub-devices of the soc and system
controller nodes are registred with simple-mfd, and each device has its
own sub-node), the documentation of the Berlin clock driver can be moved
to the generic clock documentation directory.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

The Berlin pinctrl documentation was part of the Marvell Berlin SoC
documentation because the Berlin pinctrl configuration was inside the
chip and the system controllers. With the recent rework of the chip and
system controller handling (now an MFD driver registers all sub-devices
of the two soc and system controller nodes and each device has its own
sub-node), the documentation of the Berlin pinctrl driver can be moved
to the generic pinctrl documentation directory.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

The Berlin reset documentation was part of the Marvell Berlin SoC
documentation because the Berlin reset configuration was inside the chip
controller. With the recent rework of the chip and system controller
handling (now an MFD driver registers all sub-devices of the two soc and
system controller nodes and each device has its own sub-node), the
documentation of the Berlin reset driver can be moved to the generic
reset documentation directory.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

We're moving from a single node for multiple devices to a node with one
sub-node per sub-device, registered by simple-mfd. Update the
documentation to reflect the changes.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

Because the support of Marvell Berlin SoCs is still a work in progress,
add a statement to explicitly consider our device tree files and
bindings as unstable.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

The current GPLv2 only licensing on this dts makes it very impractical
for other software components licensed under another license.

In order to make it easier for them to reuse our device trees, relicense
this dts under a GPLv2/X11 dual-license.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>