diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:13:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:13:55 +0100 |
| commit | 4eca459bc10d8400407d0fc04e90dac45b571c87 (patch) | |
| tree | 02dac5128653db41bc732c3649402b99d70d4c41 /drivers/input/matrix-keymap.c | |
| parent | socfpga: hotplug: put cpu1 in wfi (diff) | |
| parent | soc: move SoC driver for the ARM Integrator (diff) | |
| download | linux-4eca459bc10d8400407d0fc04e90dac45b571c87.tar.xz linux-4eca459bc10d8400407d0fc04e90dac45b571c87.zip | |
Merge tag 'integrator-v3.19-arm-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc
Pull "ARM SoC Integrator updates for v3.19" from Linus Walleij:
Integrator updates for the v3.19 merge cycle on
top of the multiplatform patches, this moves out
some drivers and reduced the amount of code carried
in arch/arm/mach-integrator.
- Move the Integrator/AP timer to drivers/clocksource
- Move the restart functionality to the device tree,
patches to enable restart for the Integrator have
been merged to the reset tree (orthogonal)
- Move debug LEDs to device tree (using the syscon
LED driver merged for v3.18)
- Move core module LEDs to device tree (using the
syscon LED driver merged for v3.18)
- Move the SoC driver (chip ID etc) to
drivers/soc/versatile/soc-integrator.c
* tag 'integrator-v3.19-arm-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
soc: move SoC driver for the ARM Integrator
ARM: integrator: move core module LED to device tree
ARM: integrator: move debug LEDs to syscon LED driver
ARM: integrator: move restart to the device tree
ARM: integrator: move AP timer to clocksource
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/input/matrix-keymap.c')
0 files changed, 0 insertions, 0 deletions