kevin/linux
1
Fork 0
Code
73196cd364
linux/arch/arm/mach-omap1
History
Rob Herring 1ac02d7958 ARM: fix __io macro for PCMCIA 
With commit c334bc1 (ARM: make mach/io.h include optional), PCMCIA was
broken. PCMCIA depends on __io() returning a valid i/o address, and most
ARM platforms require IO_SPACE_LIMIT be set to 0xffffffff for PCMCIA. This
needs a better fix with a fixed i/o address mapping, but for now we just
restore things to the previous behavior.

This fixes at91, omap1, pxa and sa11xx. pxa needs io.h if PCI is enabled,
but PCMCIA is not. sa11xx already has IO_SPACE_LIMIT set to 0xffffffff,
so it doesn't need an io.h.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Joachim Eastwood <joachim.eastwood@jotron.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Tested-by: Paul Parsons <lost.distance@yahoo.com> (pxa270)
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2012-04-05 11:29:55 -07:00
..
include/mach ARM: fix __io macro for PCMCIA 2012-04-05 11:29:55 -07:00
ams-delta-fiq-handler.S ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
ams-delta-fiq.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
board-ams-delta.c ARM: board specific updates 2012-03-27 16:27:28 -07:00
board-fsample.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
board-generic.c ARM: restart: omap: use new restart hook 2012-01-05 12:57:16 +00:00
board-h2-mmc.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-h2.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-h2.h
board-h3-mmc.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-h3.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-h3.h
board-htcherald.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-innovator.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-nokia770.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-osk.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-palmte.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-palmtt.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-palmz71.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-perseus2.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
board-sx1-mmc.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-sx1.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
board-voiceblue.c ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq() 2012-03-29 08:41:01 -07:00
clock_data.c ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h 2012-02-24 10:34:35 -08:00
clock.c ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h 2012-02-24 10:34:35 -08:00
clock.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
common.h ARM: OMAP: Move omap_init_consistent_dma_size() to local common.h 2012-02-24 10:34:33 -08:00
devices.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
dma.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
flash.c MTD merge for 3.4 2012-03-30 17:31:56 -07:00
fpga.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
gpio7xx.c gpio/omap: fix bankwidth for OMAP7xx MPUIO 2012-02-06 14:13:44 +05:30
gpio15xx.c gpio/omap: remove bank->method & METHOD_* macros 2012-02-06 14:13:43 +05:30
gpio16xx.c Merge branch 'depends/omap/gpio/runtime-pm-cleanup' into next/cleanup 2012-03-02 13:05:00 +00:00
i2c.c
id.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
io.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
iomap.h ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
irq.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
Kconfig ARM: board specific updates 2012-03-27 16:27:28 -07:00
lcd_dma.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
leds-h2p2-debug.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-innovator.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-osk.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
leds.h
mailbox.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
Makefile ARM: OMAP: Remove CONFIG_OMAP_MCBSP references 2012-03-12 13:34:24 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mcbsp.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
mux.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
opp_data.c ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
opp.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
pm_bus.c PM: Move clock-related definitions and headers to separate file 2011-08-25 15:34:19 +02:00
pm.c ARM: OMAP: pm: fix compilation break 2012-03-29 10:05:02 -07:00
pm.h
reset.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
serial.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
sleep.S ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
sram.S ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
time.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
timer32k.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
timer.c ARM: OMAP1: dmtimer: conversion to platform devices 2011-09-21 15:50:31 -07:00
usb.c