linux/arch/arm/mach-dove/include/mach
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
..
bridge-regs.h ARM: Orion: Fix WDT compile for Dove and MV78xx0 2012-07-04 10:37:34 +02:00
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
dove.h ARM: dove: use fixed PCI i/o mapping 2012-07-26 09:10:00 -05:00
entry-macro.S ARM: remove disable_fiq and arch_ret_to_user macros 2012-02-21 17:05:18 -06:00
hardware.h ARM: set vga memory base at run-time 2011-07-12 11:19:29 -05:00
irqs.h ARM: Dove: Remove PXA compatibility IRQ defines. 2011-03-03 16:27:03 -05:00
pm.h ARM: dove: add clock gating control 2012-09-21 17:07:20 +00:00
timex.h ARM: add base support for Marvell Dove SoC 2009-11-27 15:43:06 -05:00
uncompress.h ARM: add base support for Marvell Dove SoC 2009-11-27 15:43:06 -05:00