From Jason Cooper:
mvebu dt changes for v3.13 (round 2)

 - kirkwood
    - use MBus DT binding for setting up the windows
    - move crypto and nand underneath the mbus node
    - ib62x0 has a u-boot env partition

 - mvebu
    - add the Armada XP matrix board

* tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu:
  arm: mvebu: add support for the Armada XP Matrix board
  ARM: kirkwood: ib62x0: add u-boot environment partition
  ARM: kirkwood: Move the nand node under the mbus node
  ARM: kirkwood: Move the crypto node under the mbus node
  ARM: kirkwood: Remove kirkwood_setup_wins and rely on the DT binding
Signed-off-by: Kevin Hilman <khilman@linaro.org>

From Jason Cooper:
mvebu dt changes for v3.13

 - mvebu
    - add MSI
    - new compatible string for mv64xxx-i2c

 - dove
    - use the pre-processor
    - define the MBus nodes
    - add PCIe controllers
    - add Globalscale D3Plug
    - relocate internal registers nodes

* tag 'dt-3.13' of git://git.infradead.org/linux-mvebu:
  ARM: dove: add initial DT file for Globalscale D3Plug
  ARM: dove: add PCIe controllers to SoC DT
  ARM: dove: relocate internal registers device nodes
  ARM: dove: add MBus DT node
  ARM: dove: add MBUS_ID macro to Dove DT
  ARM: dove: use preprocessor on device tree files
  ARM: mvebu: link PCIe controllers to the MSI controller
  ARM: mvebu: the MPIC now provides MSI controller features
  ARM: dts: mvebu: Update with the new compatible string for mv64xxx-i2c
Signed-off-by: Kevin Hilman <khilman@linaro.org>

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

From Simon Horman:
Renesas ARM-based SoC DT updates for v3.13

* Add CPU cores to DTSI of r8a7790 SoC
* Add MMCIF and SDHI DT nodes for reference DTS of ape6evm board

* tag 'renesas-dt-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Add r8a7790 CA7 CPU cores to DTSI
  ARM: shmobile: Add r8a7790 CA15 CPU cores
  ARM: shmobile: ape6evm-reference: add MMCIF and SDHI DT nodes
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'ux500-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

From Linus Walleij:
Second part of the Ux500 devicetree conversion and ATAG
deletion: this fixes bugs discovered when switching to a
devicetree-only setup, primarily on the HREF prototypes.
The biggest change is to split into four DTS variants as
the UIB autodetection was lost.

* tag 'ux500-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS
  ARM: ux500: register the tc35892 GPIO on the TVK UIB
  ARM: ux500: split the HREF DTS files from two to four
  ARM: ux500: split HREF UIB files
  ARM: ux500: move TC35892 at 0x42 to hrefprev60
  ARM: ux500: correct CD for micro SD on hrev60plus
  ARM: ux500: fix proximity sensor button
  ARM: ux500: correct I2C address of ambient light sensor
  ARM: ux500 enable the AB8500 gpio for all HREFs
  ARM: ux500: add default trigger on HREF LED
Signed-off-by: Olof Johansson <olof@lixom.net>

The Armada XP Matrix board is the mother board of a more complex
system. The mother board uses an Armada XP MV78460, 4 serial ports, 2
SATA ports, one Ethernet connection, a PCIe port and a USB port. All
those devices are enabled in the Device Tree added by this patch.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

Also, add some trivial whitespace cleanup.
Signed-off-by: Luka Perkov <luka@openwrt.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

The BU21013 touchscreen GPIOs have been pretty confused, correct
them per board, and move the GPIO assignments up to the top
level DTS file so we can control it from there, and avoid defining
the GPIO assignments for non-ST UIB equipped boards.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

The TVK1281618 UIB has a TC35892 GPIO expander on it, which has
in the past probably been confused with the GPIO expander on the
older HREF plus previous to v60, which is on an entirely different
part of the system with another I2C address. Register the expander
in the right place.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

As the device tree conversion did away with the ability to
auto-detect the UIB (User Interface Board) version from attempting
to read an I2C address, we now have to pass the knowledge of
what UIB is mounted through the device tree. This gives rise
to four possible board permutations:

- HREF prior to v60, ST UIB (hrefprev60-stuib)
- HREF prior to v60, TVK1281618 UIB (hrefprev60-tvk)
- HREF v60 and later, ST UIB (href60plus-stuib)
- HREF v60 and later, TVK1281618 UIB (hrefv60plus-tvk)
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Create two different UIB (User Interface Board) include files: one per
UIB simply. The include files now only handle the devices on that
very UIB.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

The TC35892 was mounted as a GPIO expander on the HREF prior
to v60 and not in later versions, which instead use the Nomadik
GPIO directly, so move it over to the hrefprev60 DTS file.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

This correct the card detect line for the HREF v60 and later
reference designs. This is connected directly to the Nomadik
GPIO block, line 95 at offset 31 on the third instance.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

The proximity sensor is connected to pin AH12 on newer HREFs,
that corresponds to pin offset 25 on gpio5, not gpio6.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

The ambient light sensor is places at address 0x29 nothing else.
This patch makes the ambient light sensor probe again.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

There should be no nodes that are not children of the mbus. Move
the nand node under the mbus, and rework the board .dts files
to use an & reference to the nand node.
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

There should be no nodes that are not children of the mbus. Move
the crypto node under the mbus.
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

kirkwood_setup_wins is the last manual caller of mbus in kirkwood, don't
call it for DT boards and rely on the DT having a mbus node with
a proper ranges property to setup these windows.

Move all the mbus ranges properties for all boards into kirkwood.dtsi,
since they are currently all the same.

This makes the DT self consistent, since the physical address of the
NAND and CRYPTO are both referenced internally. The arbitary Linux
constants KIRKWOOD_NAND_MEM_PHYS_BASE and KIRKWOOD_SRAM_PHYS_BASE
no longer have to match the DT values.
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

* ux500/dt:
  ARM: ux500: enable appended dtb in u8500_defconfig

Merge tag 'ux500-dt-for-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

From Linus Walleij:
This is a huge device tree and ATAG removal series for ux500:
- Move all the clock definitions over to the device tree
- Remove all now-redundant AUXDATA and make the ux500 device
  tree only

* tag 'ux500-dt-for-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (92 commits)
  ARM: ux500: delete devices-common remnants
  clk: ux500: Provide a look-up for the ARMSS clock
  ARM: ux500: Enable CPUFreq on Snowball
  ARM: ux500: Provide a Device Tree node for CPUFreq in the DBx500
  ARM: ux500: Provide a clock lookup for the Hash driver
  ARM: ux500: Provide a clock lookup for the Crypto driver
  ARM: ux500: Fix trivial white-space error in the DBX500 DTSI file
  ARM: ux500: Remove ATAG booting support for Snowball
  ARM: ux500: Remove ATAG booting support for HREF
  ARM: ux500: Remove ATAG booting support for U8520
  ARM: ux500: Remove ATAG booting support for MOP500
  ARM: ux500: Purge UIB framework when booting with ATAGs
  ARM: ux500: Take out STUIB support when not booting with Device Tree
  ARM: ux500: Remove BU21013 ROHM TS support when booting with only ATAGs
  ARM: ux500: Don't register the STMPE/SKE when booting with ATAG support
  ARM: ux500: Delete U8500 UIB support when booting with ATAGs
  ARM: ux500: Don't register Synaptics RMI4 TS when booting with ATAGs
  ARM: ux500: Purge DB8500 PRCMU registration when not booting with DT
  ARM: ux500: Stop requesting the SoC device to play 'parent' role
  ARM: ux500: Remove UART support when booting without Device Tree
  ...
Signed-off-by: Olof Johansson <olof@lixom.net>

Churns the rest of the file a bit due to reordering of options, but the
only changes are:

CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
Signed-off-by: Olof Johansson <olof@lixom.net>

This adds an initial DT file for the Globalscale D3Plug with Dove SoC.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

This adds a node for the pcie controllers found on Dove SoCs to the
SoC DT include.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

With mbus node in place, now relocate all internal device nodes
to internal-regs node with proper address ranges.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

This adds a MBus node including ranges and pcie apertures required later.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

This adds a macro used for defining address window's target ID and
attribute cells for the MBus ranges entry.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

This coverts Dove DT board files to preprocessor includes instead
of dtc includes.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

This commit adjusts the Armada 370 and Armada XP PCIe controllers
Device Tree informations to reference their MSI controller. In the
case of this platform, the MSI controller is implemented by the MPIC.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Daniel Price <daniel.price@gmail.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

Adds the 'msi-controller' property to the main interrupt controller
Device Tree node, to indicate that it can now behave as a MSI
controller.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
Tested-by: Daniel Price <daniel.price@gmail.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

Add r8a7790 Cortex-A7 CPU information to DTSI.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Add CA15 CPU cores to r8a7790 for a total of 4 x CA15.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

The AB8500 GPIO was only registered for the pre-v60 HREF but should
be made available on all HREF variants, move the DT entry to the
common file.

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

This adds a heartbeat on the first LED on the ux500 HREF
boards.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

commit f1ff5b25
"ARM: ux500: Stop enabling GPIOs when not booting with Device Tree"
deleted devices-common.c, but did not delete the build
rule from Makefile (most likely due to compiling in
a dirty tree where the object file still existed so
linking would complete anyway).

Delete the makerule, the header file associated
with this file and the remaining reference to the header.

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

The ARMSS clock is used by the newly DT enabled CPUFreq driver.

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

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

This is required to fetch the ARMSS clock when booting with DT.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

The common clock framework will use the 'clock' property provided to do
a clock lookup when Device Tree is enabled.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

The common clock framework will use the 'clock' property provided to do
a clock lookup when Device Tree is enabled.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

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

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>