Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 10:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
80868a3691
linux/arch/arm/mach-kirkwood
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 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
addr-map.c ARM: Orion: mbus_dram_info consolidation 2011-12-13 18:46:55 -05:00
board-dnskw.c ARM: Kirkwood: Describe DNS32? gpio-keys in DT. 2012-07-27 16:50:02 +02:00
board-dockstar.c ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar 2012-09-21 15:12:59 +00:00
board-dreamplug.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
board-dt.c ARM: initial DTS support for km_kirkwood 2012-09-21 17:07:17 +00:00
board-goflexnet.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
board-ib62x0.c ARM: Kirkwood: Describe IB62x0 LEDs in DT. 2012-07-27 16:50:18 +02:00
board-iconnect.c ARM: Kirkwood: Describe iConnects LEDs in DT. 2012-07-27 16:50:33 +02:00
board-iomega_ix2_200.c ARM: Kirkwood: Iomega ix2-200 DT support 2012-09-21 15:12:48 +00:00
board-km_kirkwood.c ARM: initial DTS support for km_kirkwood 2012-09-21 17:07:17 +00:00
board-lsxl.c ARM: kirkwood: Add LS-XHL and LS-CHLv2 support 2012-07-27 16:49:10 +02:00
board-ts219.c ARM: Kirkwood: Use DT to configure SATA device. 2012-07-27 16:49:29 +02:00
common.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
common.h ARM: initial DTS support for km_kirkwood 2012-09-21 17:07:17 +00:00
cpuidle.c ARM: kirkwood: Consolidate time keeping and irq enable 2012-03-21 02:00:25 -04:00
d2net_v2-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
db88f6281-bp-setup.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
dockstar-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
guruplug-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
irq.c ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
Kconfig ARM: initial DTS support for km_kirkwood 2012-09-21 17:07:17 +00:00
lacie_v2-common.c [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
lacie_v2-common.h [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
Makefile ARM: initial DTS support for km_kirkwood 2012-09-21 17:07:17 +00:00
Makefile.boot Merge branch 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 13:22:21 -07:00
mpp.c ARM: Orion: Get address map from plat-orion instead of via platform_data 2011-12-13 18:46:55 -05:00
mpp.h ARM: orion: Fix Orion5x GPIO regression from MPP cleanup 2012-02-09 16:16:31 -08:00
mv88f6281gtw_ge-setup.c ARM: Orion: SPI: Add clk/clkdev support. 2012-05-08 16:33:55 -07:00
netspace_v2-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
netxbig_v2-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
openrd-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
pcie.c ARM: kirkwood: use fixed PCI i/o mapping 2012-07-26 09:10:01 -05:00
rd88f6192-nas-setup.c ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
rd88f6281-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
sheevaplug-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
t5325-setup.c ARM: Orion: SPI: Add clk/clkdev support. 2012-05-08 16:33:55 -07:00
ts41x-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
ts219-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
tsx1x-common.c ARM: Orion: SPI: Add clk/clkdev support. 2012-05-08 16:33:55 -07:00
tsx1x-common.h ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text 2010-07-26 10:33:08 +01:00