leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fb6f3d69af
linux/arch/arm/mach-dove
History
Olof Johansson 80868a3691 Merge branch 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 
* 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux:
  ARM: Dove: allow PCI to be disabled
  ARM: dove: SolidRun CuBox DT
  ARM: dove: add device tree descriptors
  ARM: dove: add device tree based machine descriptor
  ARM: dove: add crypto engine
  ARM: dove: add clock gating control
  ARM: dove: unify clock setup
  ARM: initial DTS support for km_kirkwood
  arm: add documentation describing Marvell families of SoC
  ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
  ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
  ARM: Kirkwood: Iomega ix2-200 DT support

Context conflicts in arch/arm/Kconfig and arch/arm/mach-dove/common.c.

The new device trees added to arch/arm/mach-kirkwood/Makefile.boot are
kept and dealt with in a separate changeset, since moving them out to
the new Makefile in this merge commit doesn't work well.

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 13:22:21 -07:00
..
include/mach Merge branch 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 13:22:21 -07:00
addr-map.c ARM: dove: add explicit include of dove.h to addr-map.c 2012-03-06 21:34:42 -06:00
cm-a510.c ARM: restart: dove: use new restart hook 2012-01-05 12:57:09 +00:00
common.c Merge branch 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 13:22:21 -07:00
common.h ARM: Dove: allow PCI to be disabled 2012-09-21 17:07:26 +00:00
dove-db-setup.c ARM: Orion: SPI: Add clk/clkdev support. 2012-05-08 16:33:55 -07:00
irq.c ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
Kconfig ARM: dove: add device tree based machine descriptor 2012-09-21 17:07:22 +00:00
Makefile ARM: Dove: allow PCI to be disabled 2012-09-21 17:07:26 +00:00
Makefile.boot ARM: dove: SolidRun CuBox DT 2012-09-21 17:07:25 +00:00
mpp.c ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
mpp.h ARM: dove: Consolidate mpp code with platform mpp. 2011-05-16 15:49:31 -04:00
pcie.c ARM: dove: use fixed PCI i/o mapping 2012-07-26 09:10:00 -05:00