redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity
alistair23-linux/arch/arm/mach-kirkwood
History
Arnd Bergmann 863e99a8c1 Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci 
As Stephen Rothwell reports, a849088aa1 ("ARM: Fix ioremap() of
address zero") from the arm-current tree and commit c279443709 ("ARM:
Add fixed PCI i/o mapping") from the arm-soc tree conflict in
a nontrivial way in arch/arm/mm/mmu.c.

Rob Herring explains:
The PCI i/o reserved area has a dummy physical address of 0 and
needs to be skipped by ioremap searches. So we don't set
VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct
settings don't really matter when we do the real mapping of the
i/o space.

Since commit a849088aa1 is at the start of the fixes branch
in the arm tree, we can merge it into the branch that contains
the other ioremap changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
2012-09-04 15:01:37 +02:00
..
include/mach ARM: kirkwood: use fixed PCI i/o mapping 2012-07-26 09:10:01 -05: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-dreamplug.c ARM: Kirkwood: Describe Dreamplug LEDs in DT. 2012-07-27 16:50:41 +02:00
board-dt.c ARM: Kirkwood: Replace mrvl with marvell 2012-07-27 16:50:57 +02:00
board-goflexnet.c ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT. 2012-07-27 16:50:49 +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-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 commit 'a849088aa1' from rmk/fixes into cleanup/io-pci 2012-09-04 15:01:37 +02:00
common.h ARM: kirkwood: Add LS-XHL and LS-CHLv2 support 2012-07-27 16:49:10 +02:00
cpuidle.c ARM: kirkwood: Consolidate time keeping and irq enable 2012-03-21 02:00:25 -04:00
d2net_v2-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
db88f6281-bp-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
dockstar-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
guruplug-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
irq.c ARM: Orion: DT support for IRQ and GPIO Controllers 2012-07-27 16:48:14 +02:00
Kconfig ARM: kirkwood: Add LS-XHL and LS-CHLv2 support 2012-07-27 16:49:10 +02: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: kirkwood: Add LS-XHL and LS-CHLv2 support 2012-07-27 16:49:10 +02:00
Makefile.boot ARM: kirkwood: fix typo in Makefile.boot 2012-08-07 10:48:11 +02: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: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
netxbig_v2-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
openrd-setup.c ASoC: Convert kirkwood-openrd to use snd_soc_register_card() 2012-02-07 19:40:53 +00: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: SPI: Add clk/clkdev support. 2012-05-08 16:33:55 -07:00
rd88f6281-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
sheevaplug-setup.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00: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