linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: fix __io macro for PCMCIA
@ 2012-04-04  3:11 Rob Herring
  2012-04-04  7:55 ` Arnd Bergmann
                   ` (5 more replies)
  0 siblings, 6 replies; 18+ messages in thread
From: Rob Herring @ 2012-04-04  3:11 UTC (permalink / raw)
  To: linux-arm-kernel

From: Rob Herring <rob.herring@calxeda.com>

With commit c334bc1 (ARM: make mach/io.h include optional), PCMCIA was
broken as PCMCIA depends on __io() being just a cast. This needs a better
fix with a fixed i/o address mapping, but for now we just restore things
to the previous behavior.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Joachim Eastwood <joachim.eastwood@jotron.com>
Cc: Paul Parsons <lost.distance@yahoo.com>
---
 arch/arm/include/asm/io.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index df0ac0b..00262a4 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -118,6 +118,8 @@ static inline void __iomem *__typesafe_io(unsigned long addr)
  */
 #ifdef CONFIG_NEED_MACH_IO_H
 #include <mach/io.h>
+#elif defined(CONFIG_PCCARD)
+#define __io(a)		__typesafe_io(a)
 #else
 #define __io(a)		({ (void)(a); __typesafe_io(0); })
 #endif
@@ -134,9 +136,9 @@ static inline void __iomem *__typesafe_io(unsigned long addr)
  * readb() et.al. on such platforms.
  */
 #ifndef IO_SPACE_LIMIT
-#if defined(CONFIG_PCMCIA_SOC_COMMON) || defined(CONFIG_PCMCIA_SOC_COMMON_MODULE)
+#if defined(CONFIG_PCCARD)
 #define IO_SPACE_LIMIT ((resource_size_t)0xffffffff)
-#elif defined(CONFIG_PCI) || defined(CONFIG_ISA) || defined(CONFIG_PCCARD)
+#elif defined(CONFIG_PCI) || defined(CONFIG_ISA)
 #define IO_SPACE_LIMIT ((resource_size_t)0xffff)
 #else
 #define IO_SPACE_LIMIT ((resource_size_t)0)
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2012-04-05 18:29 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-04  3:11 [PATCH] ARM: fix __io macro for PCMCIA Rob Herring
2012-04-04  7:55 ` Arnd Bergmann
2012-04-04  9:03 ` Russell King - ARM Linux
2012-04-04 10:27   ` Arnd Bergmann
2012-04-04 12:56     ` Russell King - ARM Linux
2012-04-04 13:04       ` Russell King - ARM Linux
2012-04-04 13:47         ` Rob Herring
2012-04-04 14:16           ` Russell King - ARM Linux
2012-04-04 10:02 ` Joachim Eastwood
2012-04-04 12:45   ` Rob Herring
2012-04-04 12:49     ` Joachim Eastwood
2012-04-04 11:05 ` Paul Parsons
2012-04-04 14:23 ` Russell King - ARM Linux
2012-04-04 22:48 ` [PATCH v2] " Rob Herring
2012-04-04 23:03   ` Paul Parsons
2012-04-05  0:47   ` Tony Lindgren
2012-04-05 10:10   ` Joachim Eastwood
2012-04-05 18:29   ` Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).