Skip to contentSkip to conversation

PXA: Remove PXA PCMCIA support

PATCH New Marek Vasut 1 participant 1 message Feb 13, 2012 Pcmcia

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PXA: Remove PXA PCMCIA support

Say good bye to some ancient, very broken and unused code.

---
 doc/README.PXA_CF           |   56 --------------------------
 drivers/pcmcia/Makefile     |    1 -
 drivers/pcmcia/pxa_pcmcia.c |   93 -------------------------------------------
 include/pcmcia.h            |    3 +-
 4 files changed, 1 insertions(+), 152 deletions(-)
 delete mode 100644 doc/README.PXA_CF
 delete mode 100644 drivers/pcmcia/pxa_pcmcia.c
doc/README.PXA_CF deleted +0 -56
deleted file mode 100644
index 1d76b32..0000000
@@ -1,56 +0,0 @@
-
-These are brief instructions on how to add support for CF adapters to
-custom designed  PXA boards. You need to set the parameters in the
-config file. This should work for most implementations especially if you
-follow the connections of the standard lubbock. Anyway just the block
-marked memory configuration should be touched since the other parameters
-are imposed by the PXA architecture.
-
-EDIT 2010-07-01: in common/cmd_ide.c, having CONFIG_PXA_PCMCIA defined
-would cause looping on inw()/outw() rather than using insw()/outsw(),
-thus making sure IDE / ATA bytes are properly swapped. This behaviour
-is now controlled by CONFIG_IDE_SWAP_IO, therefore PXA boards with
-PCMCIA should #define CONFIG_IDE_SWAP_IO.
-
-#define CONFIG_IDE_SWAP_IO
-
-#define CONFIG_PXA_PCMCIA 1
-#define CONFIG_PXA_IDE 1
-
-#define CONFIG_PCMCIA_SLOT_A 1
-/* just to keep build system happy  */
-
-#define CONFIG_SYS_PCMCIA_MEM_ADDR     0x28000000
-#define CONFIG_SYS_PCMCIA_MEM_SIZE     0x10000000
-
-#define CONFIG_SYS_MECR_VAL		0x00000000
-#define CONFIG_SYS_MCMEM0_VAL		0x00004204
-#define CONFIG_SYS_MCMEM1_VAL		0x00000000
-#define CONFIG_SYS_MCATT0_VAL		0x00010504
-#define CONFIG_SYS_MCATT1_VAL		0x00000000
-#define CONFIG_SYS_MCIO0_VAL		0x00008407
-#define CONFIG_SYS_MCIO1_VAL		0x00000000
-/* memory configuration */
-
-#define CONFIG_SYS_IDE_MAXBUS		1
-/* max. 1 IDE bus		*/
-#define CONFIG_SYS_IDE_MAXDEVICE	1
-/* max. 1 drive per IDE bus	*/
-
-#define CONFIG_SYS_ATA_IDE0_OFFSET	0x0000
-
-#define CONFIG_SYS_ATA_BASE_ADDR	0x20000000
-
-/* Offset for data I/O			*/
-#define CONFIG_SYS_ATA_DATA_OFFSET	0x1f0
-
-/* Offset for normal register accesses	*/
-#define CONFIG_SYS_ATA_REG_OFFSET	0x1f0
-
-/* Offset for alternate registers	*/
-#define CONFIG_SYS_ATA_ALT_OFFSET	0x3f0
-
-
-Another important point is that maybe you have to power the pcmcia
-subsystem. This is very board specific, for an example on how to
-do it please search for CONFIG_EXADRON1 in cmd_pcmcia.c
drivers/pcmcia/Makefile +0 -1
index 0349508..aa477d4 100644
@@ -27,7 +27,6 @@ LIB	:= $(obj)libpcmcia.o
 
 COBJS-$(CONFIG_I82365) += i82365.o
 COBJS-$(CONFIG_8xx) += mpc8xx_pcmcia.o
-COBJS-$(CONFIG_PXA_PCMCIA) += pxa_pcmcia.o
 COBJS-y += rpx_pcmcia.o
 COBJS-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o
 COBJS-y += tqm8xx_pcmcia.o
drivers/pcmcia/pxa_pcmcia.c deleted +0 -93

93 lines not on this page · raw message

include/pcmcia.h +1 -2
index b60323d..ca0bf22 100644
@@ -313,8 +313,7 @@ extern u_int *pcmcia_pgcrx[];
 #define	PCMCIA_PGCRX(slot)	(*pcmcia_pgcrx[slot])
 #endif
 
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) \
-	|| defined(CONFIG_PXA_PCMCIA)
+#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
 extern int check_ide_device(int slot);
 #endif
 
Signature · 1 line
1.7.8.3