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

Commit 10a27a29 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

pcmcia: remove m32r drivers 



The m32r architecture is getting removed, so these drivers
are no longer needed.

Acked-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent dabad549

drivers/pcmcia/Kconfig

+0 −19
Original line number Diff line number Diff line
@@ -232,25 +232,6 @@ config PCMCIA_PROBE 
	bool

	default y if ISA && !ARCH_SA1100 && !PARISC



config M32R_PCC

	bool "M32R PCMCIA I/F"

	depends on M32R && CHIP_M32700 && PCMCIA

	help

	  Say Y here to use the M32R PCMCIA controller.



config M32R_CFC

	bool "M32R CF I/F Controller"

	depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT)

	help

	  Say Y here to use the M32R CompactFlash controller.



config M32R_CFC_NUM

	int "M32R CF I/F number"

	depends on M32R_CFC

	default "1" if PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT

	help

	  Set the number of M32R CF slots.



config PCMCIA_VRC4171

	tristate "NEC VRC4171 Card Controllers support"

	depends on CPU_VR41XX && ISA && PCMCIA

drivers/pcmcia/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ obj-$(CONFIG_PCMCIA_SOC_COMMON) += soc_common.o 
obj-$(CONFIG_PCMCIA_SA11XX_BASE)		+= sa11xx_base.o

obj-$(CONFIG_PCMCIA_SA1100)			+= sa1100_cs.o

obj-$(CONFIG_PCMCIA_SA1111)			+= sa1111_cs.o

obj-$(CONFIG_M32R_PCC)				+= m32r_pcc.o

obj-$(CONFIG_M32R_CFC)				+= m32r_cfc.o

obj-$(CONFIG_PCMCIA_BCM63XX)			+= bcm63xx_pcmcia.o

obj-$(CONFIG_PCMCIA_VRC4171)			+= vrc4171_card.o

obj-$(CONFIG_PCMCIA_VRC4173)			+= vrc4173_cardu.o

drivers/pcmcia/m32r_cfc.c

deleted100644 → 0
+0 −786

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/pcmcia/m32r_cfc.h

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

/*

 * Copyright (C) 2001 by Hiroyuki Kondo

 */



#if !defined(CONFIG_M32R_CFC_NUM)

#define M32R_MAX_PCC	2

#else

#define M32R_MAX_PCC	CONFIG_M32R_CFC_NUM

#endif



/*

 * M32R PC Card Controller

 */

#define M32R_PCC0_BASE        0x00ef7000

#define M32R_PCC1_BASE        0x00ef7020



/*

 * Register offsets

 */

#define PCCR            0x00

#define PCADR           0x04

#define PCMOD           0x08

#define PCIRC           0x0c

#define PCCSIGCR        0x10

#define PCATCR          0x14



/*

 * PCCR

 */

#define PCCR_PCEN       (1UL<<(31-31))



/*

 * PCIRC

 */

#define PCIRC_BWERR     (1UL<<(31-7))

#define PCIRC_CDIN1     (1UL<<(31-14))

#define PCIRC_CDIN2     (1UL<<(31-15))

#define PCIRC_BEIEN     (1UL<<(31-23))

#define PCIRC_CIIEN     (1UL<<(31-30))

#define PCIRC_COIEN     (1UL<<(31-31))



/*

 * PCCSIGCR

 */

#define PCCSIGCR_SEN    (1UL<<(31-3))

#define PCCSIGCR_VEN    (1UL<<(31-7))

#define PCCSIGCR_CRST   (1UL<<(31-15))

#define PCCSIGCR_COCR   (1UL<<(31-31))



/*

 *

 */

#define PCMOD_AS_ATTRIB	(1UL<<(31-19))

#define PCMOD_AS_IO	(1UL<<(31-18))



#define PCMOD_CBSZ	(1UL<<(31-23)) /* set for 8bit */



#define PCMOD_DBEX	(1UL<<(31-31)) /* set for excahnge */



/*

 * M32R PCC Map addr

 */



#define M32R_PCC0_MAPBASE        0x14000000

#define M32R_PCC1_MAPBASE        0x16000000



#define M32R_PCC_MAPMAX		 0x02000000



#define M32R_PCC_MAPSIZE	 0x00001000 /* XXX */

#define M32R_PCC_MAPMASK     	(~(M32R_PCC_MAPMAX-1))



#define CFC_IOPORT_BASE		0x1000



#if defined(CONFIG_PLAT_MAPPI3)

#define CFC_ATTR_MAPBASE	0x14014000

#define CFC_IO_MAPBASE_BYTE	0xb4012000

#define CFC_IO_MAPBASE_WORD	0xb4002000

#elif !defined(CONFIG_PLAT_USRV)

#define CFC_ATTR_MAPBASE        0x0c014000

#define CFC_IO_MAPBASE_BYTE     0xac012000

#define CFC_IO_MAPBASE_WORD     0xac002000

#else

#define CFC_ATTR_MAPBASE	0x04014000

#define CFC_IO_MAPBASE_BYTE	0xa4012000

#define CFC_IO_MAPBASE_WORD	0xa4002000

#endif	/* CONFIG_PLAT_USRV */

drivers/pcmcia/m32r_pcc.c

deleted100644 → 0
+0 −763

File deleted.

Preview size limit exceeded, changes collapsed.