Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ac02d79 authored by Rob Herring's avatar Rob Herring Committed by Olof Johansson
Browse files

ARM: fix __io macro for PCMCIA 



With commit c334bc15 (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: default avatarRob 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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 00bd60fe

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ config ARCH_AT91 
	select HAVE_CLK

	select CLKDEV_LOOKUP

	select IRQ_DOMAIN

	select NEED_MACH_IO_H if PCCARD

	help

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 processors.

arch/arm/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static inline void __iomem *__typesafe_io(unsigned long addr) 
#ifdef CONFIG_NEED_MACH_IO_H

#include <mach/io.h>

#else

#define __io(a)		({ (void)(a); __typesafe_io(0); })

#define __io(a)		__typesafe_io((a) & IO_SPACE_LIMIT)

#endif



/*

arch/arm/mach-at91/include/mach/io.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-at91/include/mach/io.h

 *

 *  Copyright (C) 2003 SAN People

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#ifndef __ASM_ARCH_IO_H

#define __ASM_ARCH_IO_H



#define IO_SPACE_LIMIT		0xFFFFFFFF

#define __io(a)			__typesafe_io(a)



#endif

arch/arm/mach-omap1/include/mach/io.h

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-omap1/include/mach/io.h

 *

 * IO definitions for TI OMAP processors and boards

 *

 * Copied from arch/arm/mach-sa1100/include/mach/io.h

 * Copyright (C) 1997-1999 Russell King

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the

 * Free Software Foundation; either version 2 of the License, or (at your

 * option) any later version.

 *

 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED

 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN

 * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,

 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF

 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 675 Mass Ave, Cambridge, MA 02139, USA.

 *

 * Modifications:

 *  06-12-1997	RMK	Created.

 *  07-04-1999	RMK	Major cleanup

 */



#ifndef __ASM_ARM_ARCH_IO_H

#define __ASM_ARM_ARCH_IO_H



#define IO_SPACE_LIMIT 0xffffffff



/*

 * We don't actually have real ISA nor PCI buses, but there is so many

 * drivers out there that might just work if we fake them...

 */

#define __io(a)		__typesafe_io(a)



#endif

arch/arm/mach-pxa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ config MACH_ARMCORE 
	select IWMMXT

	select PXA25x

	select MIGHT_HAVE_PCI

	select NEED_MACH_IO_H if PCI



config MACH_EM_X270

	bool "CompuLab EM-x270 platform"