Commit 91276c0f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: s3c24xx: remove support for ISA drivers on BAST PC/104 



BAST is the one machine that theoretically supports unmodified ISA
drivers for hardware on its PC/104 connector, using a custom version of
the inb()/outb() and inw()/outw() macros.

This is incompatible with the generic version used in asm/io.h, and
can't easily be used in a multiplatform kernel.

Removing the special case for 16-bit I/O port access on BAST gets us
closer to multiplatform, at the expense of any PC/104 users with 16-bit
cards having to either use an older kernel or modify their ISA drivers
to manually ioremap() the area and use readw()/write() in place of
inw()/outw(). Either way is probably ok, given that there is a
recurring discussion about dropping s3c24xx altogether, and many
traditional ISA drivers are already gone.

Machines other than BAST already have no support for ISA drivers, though a
couple of them do map one of the external chip-selects into the ISA port
range, using the same address for 8-bit and 16-bit I/O. It is unlikely
that anything actually uses this mapping, but it's also easy to keep
this working by mapping it to the normal platform-independent PCI I/O
base that is otherwise unused on s3c24xx.

The mach/map-base.h file is no longer referenced in global headers and
can be moved into the platform directory.

Acked-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 09f6b27d

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -444,7 +444,6 @@ config ARCH_S3C24XX 
	select CLKSRC_SAMSUNG_PWM

	select GPIO_SAMSUNG

	select GPIOLIB

	select NEED_MACH_IO_H

	select S3C2410_WATCHDOG

	select SAMSUNG_ATAGS

	select USE_OF

arch/arm/mach-s3c/Kconfig.s3c24xx

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ config MACH_AML_M5900 


config ARCH_BAST

	bool "Simtec Electronics BAST (EB2410ITX)"

	select ISA

	select MACH_BAST_IDE

	select S3C2410_COMMON_DCLK

	select S3C2410_IOTIMING if ARM_S3C2410_CPUFREQ

arch/arm/mach-s3c/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/init.h>

#include <linux/io.h>



#include <mach/map-base.h>

#include "map-base.h"

#include "cpu.h"



unsigned long samsung_cpu_id;

arch/arm/mach-s3c/include/mach/io-s3c24xx.h

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

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

 *  from arch/arm/mach-rpc/include/mach/io.h

 *

 * Copyright (C) 1997 Russell King

 *	     (C) 2003 Simtec Electronics

*/



#ifndef __ASM_ARM_ARCH_IO_S3C24XX_H

#define __ASM_ARM_ARCH_IO_S3C24XX_H



#include <mach/map-base.h>



/*

 * ISA style IO, for each machine to sort out mappings for,

 * if it implements it. We reserve two 16M regions for ISA,

 * so the PC/104 can use separate addresses for 8-bit and

 * 16-bit port I/O.

 */

#define PCIO_BASE		S3C_ADDR(0x02000000)

#define IO_SPACE_LIMIT		0x00ffffff

#define S3C24XX_VA_ISA_WORD	(PCIO_BASE)

#define S3C24XX_VA_ISA_BYTE	(PCIO_BASE + 0x01000000)



#ifdef CONFIG_ISA



#define inb(p)		readb(S3C24XX_VA_ISA_BYTE + (p))

#define inw(p)		readw(S3C24XX_VA_ISA_WORD + (p))

#define inl(p)		readl(S3C24XX_VA_ISA_WORD + (p))



#define outb(v,p)	writeb((v), S3C24XX_VA_ISA_BYTE + (p))

#define outw(v,p)	writew((v), S3C24XX_VA_ISA_WORD + (p))

#define outl(v,p)	writel((v), S3C24XX_VA_ISA_WORD + (p))



#define insb(p,d,l)	readsb(S3C24XX_VA_ISA_BYTE + (p),d,l)

#define insw(p,d,l)	readsw(S3C24XX_VA_ISA_WORD + (p),d,l)

#define insl(p,d,l)	readsl(S3C24XX_VA_ISA_WORD + (p),d,l)



#define outsb(p,d,l)	writesb(S3C24XX_VA_ISA_BYTE + (p),d,l)

#define outsw(p,d,l)	writesw(S3C24XX_VA_ISA_WORD + (p),d,l)

#define outsl(p,d,l)	writesl(S3C24XX_VA_ISA_WORD + (p),d,l)



#else



#define __io(x) (PCIO_BASE + (x))



#endif



#endif

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

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2020 Krzysztof Kozlowski <krzk@kernel.org>

 */



#ifdef CONFIG_ARCH_S3C24XX

#include "io-s3c24xx.h"

#endif