diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-04-30 21:45:33 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-09 09:15:41 (GMT) |
commit | e86bde3caea693b2e615e7b3664e6273160bf864 (patch) | |
tree | 5312f387803939687ad49e9074536484f3f9f895 /arch/arm/mach-ep93xx | |
parent | 6875dc6521be57f695845d13469109a388029e43 (diff) | |
parent | 3de3d74956e26af0a5647e98f73eaf8efd0d07bd (diff) | |
download | linux-fsl-qoriq-e86bde3caea693b2e615e7b3664e6273160bf864.tar.xz |
Merge branch 'ux500-devicetree-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
Linus Walleij <linus.walleij@linaro.org> writes:
this pull request contains some device tree work by Lee Jones.
I have tried to keep these patches in the arch/arm/boot/dts/*
space to get some sanity in the branch proliferation.
There is still one patch that touches arch/arm/mach-ux500 too
though (but it should merge fine with the other ux500 stuff).
The changes to the device tree are of course dependent on some
core changes and some patching in the GPIO/pin driver, but as
the device tree files are believed to be a different world
(and should one day live in their own git) I split this off
anyway. I don't think people bisect the device trees per se
and the board code in conjunction anyway.
* 'ux500-devicetree-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: Configure the PRCMU Timer for db8500 based devices in DT
ARM: ux500: Enable the SMSC9115 on Snowball via Device Tree
drivers/gpio: represent gpio-nomadik as an IRQ controller in DT documentation
ARM: ux500: Rename gpio_keys in the Device Tree file
drivers/gpio: gpio-nomadik: Provide documentation for Device Tree bindings
drivers/gpio: gpio-nomadik: Device Tree bindings
ARM: ux500: Enable the external bus with Device Tree
ARM: ux500: Shorten Snowball's DT compatible gpio entry
ARM: ux500: Rename the DT compatible entry for i2c devices on Snowball
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ep93xx')
0 files changed, 0 insertions, 0 deletions