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

Commit 1be27c62 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Nicolas Ferre
Browse files

ARM: at91: remove NEED_MACH_IO_H 



The mach/io.h header on at91 is used to support a nonstandard I/O space
window for the cf card driver. This changes the driver to use pci_ioremap_io
in order to have the standard location, and then removes the custom
mach/io.h.

[alexandre.belloni@free-electrons.com: Added PCI dependency]
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 385acc0d

arch/arm/Kconfig

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

	select CLKDEV_LOOKUP

	select IRQ_DOMAIN

	select NEED_MACH_IO_H if PCCARD

	select PINCTRL

	select PINCTRL_AT91

	select USE_OF

arch/arm/mach-at91/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ config SOC_AT91RM9200 
	select CPU_ARM920T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USB_CLK

	select MIGHT_HAVE_PCI

	select SRAM if PM



config SOC_AT91SAM9

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

deleted100644 → 0
+0 −27
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

drivers/pcmcia/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ config BFIN_CFPCMCIA 


config AT91_CF

	tristate "AT91 CompactFlash Controller"

	depends on PCI

	depends on PCMCIA && ARCH_AT91

	depends on !ARCH_MULTIPLATFORM

	help

drivers/pcmcia/at91_cf.c

+7 −6
Original line number Diff line number Diff line
@@ -317,13 +317,14 @@ static int at91_cf_probe(struct platform_device *pdev) 
	} else

		cf->socket.pci_irq = nr_irqs + 1;



	/* pcmcia layer only remaps "real" memory not iospace */

	cf->socket.io_offset = (unsigned long) devm_ioremap(&pdev->dev,

					cf->phys_baseaddr + CF_IO_PHYS, SZ_2K);

	if (!cf->socket.io_offset) {

		status = -ENXIO;

	/*

	 * pcmcia layer only remaps "real" memory not iospace

	 * io_offset is set to 0x10000 to avoid the check in static_find_io().

	 * */

	cf->socket.io_offset = 0x10000;

	status = pci_ioremap_io(0x10000, cf->phys_baseaddr + CF_IO_PHYS);

	if (status)

		goto fail0a;

	}



	/* reserve chip-select regions */

	if (!devm_request_mem_region(&pdev->dev, io->start, resource_size(io), "at91_cf")) {