Skip to contentSkip to conversation

ARM: at91: remove NEED_MACH_IO_H

PATCH New Arnd Bergmann 2 participants 4 messages Mar 2, 2015

Subsystems (4)
Arm (32-bit) Arm sub-architectures Arm/Microchip (AT91) SoC support Pcmcia
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 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.

Signed-off-by Arnd Bergmann <[email protected]>

----
I've found this patch in an old git tree of mine. I think it's still needed, but see for yourselves.

arch/arm/Kconfig +0 -1
index 4db6c803eaf2..b2798e25829a 100644
@@ -351,7 +351,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/include/mach/io.h deleted +0 -27
deleted file mode 100644
index 2d9ca0455745..000000000000
@@ -1,27 +0,0 @@
-/*
- * 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/at91_cf.c +3 -5
index bfb799c7b343..a2b677a8abb5 100644
@@ -318,12 +318,10 @@ static int at91_cf_probe(struct platform_device *pdev)
 		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;
+	cf->socket.io_offset = 0;
+	status = pci_ioremap_io(0, 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")) {
#1 lore raw

PATCH 1/1 ARM: at91: remove NEED_MACH_IO_H

Quoted 10 lines · Arnd Bergmann

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.

Signed-off-by Arnd Bergmann <[email protected]>

----
I've found this patch in an old git tree of mine. I think it's still needed, but see for yourselves.

Do you think we can take it through the at91 tree? I think my previous patch went through arm-soc.

If yes, I'll include it in the multiplatform series to reduce the number of conflicts in Kconfig.

Signature · 3 lines
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 ARM: at91: remove NEED_MACH_IO_H

Quoted 12 lines · On Monday 02 March 2015 14:22:34 Alexandre Belloni wrote:
Quoted 10 lines · Arnd Bergmann

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.

Signed-off-by Arnd Bergmann <[email protected]>

----
I've found this patch in an old git tree of mine. I think it's still needed, but see for yourselves.

Quoted 5 lines

Do you think we can take it through the at91 tree? I think my previous patch went through arm-soc.

If yes, I'll include it in the multiplatform series to reduce the number of conflicts in Kconfig.

Yes, I think that would be good.

Arnd

#3 lore raw

PATCH 1/1 ARM: at91: remove NEED_MACH_IO_H

In reply to Arnd Bergmann

Hi,

Quoted 15 lines · Arnd Bergmann

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.

Signed-off-by Arnd Bergmann <[email protected]>

----
I've found this patch in an old git tree of mine. I think it's still needed, but see for yourselves.

arch/arm/Kconfig +0 -0
index 4db6c803eaf2..b2798e25829a 100644

arch/arm/Kconfig config ARCH_AT91 · line 356

Quoted 7 lines
arch/arm/Kconfig +0 -1
@@ -351,7 +351,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

That also needs:

arch/arm/mach-at91/Kconfig +1 -0
index c74a44324e5b..7ecde7de69da 100644
@@ -81,6 +81,7 @@ config SOC_AT91RM9200
        select CPU_ARM920T
        select GENERIC_CLOCKEVENTS
        select HAVE_AT91_USB_CLK
+       select MIGHT_HAVE_PCI
 
 config SOC_AT91SAM9
        bool "AT91SAM9"
drivers/pcmcia/Kconfig +1 -0
index 3bb49252a098..075d5cd4c5ab 100644
@@ -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

I'll amend the patch if you agree.

Signature · 3 lines
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com