mtd: remove dead map drivers
Subsystems (3)
cover mtd: remove dead map drivers
This patch-set removes a bunch of dean MTD map drivers. The way I judged whether a driver is dead or not was looking at driver's dependencies in the Kconfig file. Whenever I saw a driver depending on a Kconfig symbol which is not defined anywhere, I treated the driver as dead.
The motivation for this patch-set is to clean up the MTD subsystem a little and lessen the maintenance burden. Indeed, the less drivers we have, the easier it is to do MTD framework refactoring.
Thanks,
Artem.
PATCH 3/10 mtd: remove the mbx860 map driver
From: Artem Bityutskiy <[email protected]>
This driver depends on CONFIG_MBX which is not defined anywhere, which means this driver is dead.
--- drivers/mtd/maps/Kconfig | 8 ---- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/mbx860.c | 98 --------------------------------------------- 3 files changed, 107 deletions(-) delete mode 100644 drivers/mtd/maps/mbx860.c
drivers/mtd/maps/Kconfig +0 -8
@@ -294,14 +294,6 @@ config MTD_RPXLITE to communicate with the chips on the RPXLite board. More at <http://www.embeddedplanet.com/>. -config MTD_MBX860 - tristate "System flash on MBX860 board" - depends on MTD_CFI && MBX - help - This enables access routines for the flash chips on the Motorola - MBX860 board. If you have one of these boards and would like - to use the flash chips on it, say 'Y'. - config MTD_CFI_FLAGADM tristate "CFI Flash device mapping on FlagaDM" depends on 8xx && MTD_CFI
drivers/mtd/maps/Makefile +0 -1
@@ -17,7 +17,6 @@ obj-$(CONFIG_MTD_ICHXROM) += ichxrom.o obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o -obj-$(CONFIG_MTD_MBX860) += mbx860.o obj-$(CONFIG_MTD_OCTAGON) += octagon-5066.o obj-$(CONFIG_MTD_PHYSMAP) += physmap.o obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o
drivers/mtd/maps/mbx860.c deleted +0 -98
98 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 4/10 pcmcia: remove Motorolla MBX860 support
In reply to Artem BityutskiyFrom: Artem Bityutskiy <[email protected]>
The CONFIG_MBX symbol is not defined anywhere in the kernel tree, which means this platform is not supported by the Linux kernel and we can remove the corresponding code from the 'm8xx_pcmcia' driver.
--- drivers/pcmcia/m8xx_pcmcia.c | 59 ------------------------------------------ 1 file changed, 59 deletions(-)
NOTE: this commit is independent, and I can merge it via the MTD tree with the rest of the patches of this series. Of course, an ACK would be great to have. And of course, if PCMCIA people wish to merge it via their tree, it is also nice, just let me know.
drivers/pcmcia/m8xx_pcmcia.c +0 -59
@@ -419,65 +419,6 @@ static inline int voltage_set(int slot, int vcc, int vpp)#endif -/* ------------------------------------------------------------------------- */ -/* Motorola MBX860 */ - -#if defined(CONFIG_MBX ) - -#define PCMCIA_BOARD_MSG "MBX" - -static int voltage_set (int slot,int vcc,int vpp) -{ -u8 reg =0 ; - -switch (vcc) { -case 0 : -break ; -case 33 : - reg |=CSR2_VCC_33 ; -break ; -case 50 : - reg |=CSR2_VCC_50 ; -break ; -default : -return 1 ; - } - -switch (vpp) { -case 0 : -break ; -case 33 : -case 50 : -if (vcc == vpp) - reg |=CSR2_VPP_VCC ; -else -return 1 ; -break ; -case 120 : -if ((vcc ==33 ) || (vcc ==50 )) - reg |=CSR2_VPP_12 ; -else -return 1 ; -default : -return 1 ; - } - -/* first, turn off all power */ -out_8 ((u8 *)MBX_CSR2_ADDR , -in_8 ((u8 *)MBX_CSR2_ADDR ) & ~(CSR2_VCC_MASK |CSR2_VPP_MASK )); - -/* enable new powersettings */ -out_8 ((u8 *)MBX_CSR2_ADDR ,in_8 ((u8 *)MBX_CSR2_ADDR ) | reg); - -return 0 ; -} - -#define socket_get (_slot_) PCMCIA_SOCKET_KEY_5V -#define hardware_enable (_slot_)/* No hardware to enable */ -#define hardware_disable (_slot_)/* No hardware to disable */ - -#endif /* CONFIG_MBX */ -#if defined(CONFIG_PRxK)#include <asm/cpld.h> extern volatile fpga_pc_regs *fpga_pc;
Signature · 1 line
1.7.10.4
PATCH 5/10 mtd: maps: kill the rpxlite map driver
In reply to Artem BityutskiyFrom: Artem Bityutskiy <[email protected]>
This driver depends on the CONFIG_RPXCLASSIC and CONFIG_RPXLITE symbols, which are not defined anywhere, and this means that this driver is dead.
--- drivers/mtd/maps/Kconfig | 10 ------- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/rpxlite.c | 64 -------------------------------------------- 3 files changed, 75 deletions(-) delete mode 100644 drivers/mtd/maps/rpxlite.c
drivers/mtd/maps/Kconfig +0 -10
@@ -284,16 +284,6 @@ config MTD_TQM8XXL code to communicate with the chips on the TQM8xxL board. More at <http://www.denx.de/wiki/PPCEmbedded/>. -config MTD_RPXLITE - tristate "CFI Flash device mapped on RPX Lite or CLLF" - depends on MTD_CFI && (RPXCLASSIC || RPXLITE) - help - The RPXLite PowerPC board has CFI-compliant chips mapped in - a strange sparse mapping. This 'mapping' driver supports that - arrangement, allowing the CFI probe and command set driver code - to communicate with the chips on the RPXLite board. More at - <http://www.embeddedplanet.com/>. - config MTD_CFI_FLAGADM tristate "CFI Flash device mapping on FlagaDM" depends on 8xx && MTD_CFI
drivers/mtd/maps/Makefile +0 -1
@@ -23,7 +23,6 @@ obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o obj-$(CONFIG_MTD_PISMO) += pismo.o obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o -obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o obj-$(CONFIG_MTD_SA1100) += sa1100-flash.o obj-$(CONFIG_MTD_SBC_GXX) += sbc_gxx.o
drivers/mtd/maps/rpxlite.c deleted +0 -64
64 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 6/10 m68k: remove rpxlite stuff
In reply to Artem BityutskiyFrom: Artem Bityutskiy <[email protected]>
The CONFIG_RPXLITE is not defined anywhere, which means that this board is not supported anyway, and we can clean-up commproc.h a little.
--- arch/m68k/include/asm/commproc.h | 17 ----------------- 1 file changed, 17 deletions(-)
NOTE: this commit is independent, and I can merge it via the MTD tree with the rest of the patches of this series. Of course, an ACK would be great to have. And of course, if m68k people wish to merge it via their tree, it is also nice, just let me know.
arch/m68k/include/asm/commproc.h +0 -17
@@ -480,23 +480,6 @@ typedef struct scc_enet {#define SICR_ENET_CLKRT ((uint)0x0000003d)#endif -#ifdef CONFIG_RPXLITE -/* This ENET stuff is for the MPC850 with ethernet on SCC2. Some of -* this may be unique to the RPX-Lite configuration. -* Note TENA is on Port B. -*/ -#define PA_ENET_RXD ((ushort)0x0004) -#define PA_ENET_TXD ((ushort)0x0008) -#define PA_ENET_TCLK ((ushort)0x0200) -#define PA_ENET_RCLK ((ushort)0x0800) -#define PB_ENET_TENA ((uint)0x00002000) -#define PC_ENET_CLSN ((ushort)0x0040) -#define PC_ENET_RENA ((ushort)0x0080) - -#define SICR_ENET_MASK ((uint)0x0000ff00) -#define SICR_ENET_CLKRT ((uint)0x00003d00) -#endif -#ifdef CONFIG_BSEIP /* This ENET stuff is for the MPC823 with ethernet on SCC2. * This is unique to the BSE ip-Engine board.
Signature · 1 line
1.7.10.4
PATCH 7/10 pcmcia: remove RPX board stuff
In reply to Artem BityutskiyFrom: Artem Bityutskiy <[email protected]>
The RPX board is not supported by the kernel because CONFIG_RPXCLASSIC and CONFIG_RPXLITE symbols and not defined anywhere. Clean-up the m8xx_pcmcia driver a little bit.
--- drivers/pcmcia/m8xx_pcmcia.c | 81 ------------------------------------------ 1 file changed, 81 deletions(-)
NOTE: this commit is independent, and I can merge it via the MTD tree with the rest of the patches of this series. Of course, an ACK would be great to have. And of course, if PCMCIA people wish to merge it via their tree, it is also nice, just let me know.
drivers/pcmcia/m8xx_pcmcia.c +0 -81
@@ -68,12 +68,6 @@ MODULE_LICENSE("Dual MPL/GPL");#if !defined(CONFIG_PCMCIA_SLOT_A ) && !defined(CONFIG_PCMCIA_SLOT_B ) -/* The RPX series use SLOT_B */ -#if defined(CONFIG_RPXCLASSIC ) || defined(CONFIG_RPXLITE ) -#define CONFIG_PCMCIA_SLOT_B -#define CONFIG_BD_IS_MHZ -#endif -/* The ADS board use SLOT_A */ #ifdef CONFIG_ADS #define CONFIG_PCMCIA_SLOT_A
@@ -253,81 +247,6 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev);#define PCMCIA_BMT_LIMIT (15*4)/* Bus Monitor Timeout value */ -/* ------------------------------------------------------------------------- */ -/* board specific stuff: */ -/* voltage_set(), hardware_enable() and hardware_disable() */ -/* ------------------------------------------------------------------------- */ -/* RPX Boards from Embedded Planet */ - -#if defined(CONFIG_RPXCLASSIC ) || defined(CONFIG_RPXLITE ) - -/* The RPX boards seems to have it's bus monitor timeout set to 6*8 clocks. -* SYPCR is write once only, therefore must the slowest memory be faster -* than the bus monitor or we will get a machine check due to the bus timeout. -*/ - -#define PCMCIA_BOARD_MSG "RPX CLASSIC or RPX LITE" - -#undef PCMCIA_BMT_LIMIT -#define PCMCIA_BMT_LIMIT (6*8) - -static int voltage_set (int slot,int vcc,int vpp) -{ -u32 reg =0 ; - -switch (vcc) { -case 0 : -break ; -case 33 : - reg |=BCSR1_PCVCTL4 ; -break ; -case 50 : - reg |=BCSR1_PCVCTL5 ; -break ; -default : -return 1 ; - } - -switch (vpp) { -case 0 : -break ; -case 33 : -case 50 : -if (vcc == vpp) - reg |=BCSR1_PCVCTL6 ; -else -return 1 ; -break ; -case 120 : - reg |=BCSR1_PCVCTL7 ; -default : -return 1 ; - } - -if (!((vcc ==50 ) || (vcc ==0 ))) -return 1 ; - -/* first, turn off all power */ - -out_be32 (((u32 *)RPX_CSR_ADDR ), -in_be32 (((u32 *)RPX_CSR_ADDR )) & ~(BCSR1_PCVCTL4 | -BCSR1_PCVCTL5 | -BCSR1_PCVCTL6 | -BCSR1_PCVCTL7 )); - -/* enable new powersettings */ - -out_be32 (((u32 *)RPX_CSR_ADDR ),in_be32 (((u32 *)RPX_CSR_ADDR )) | reg); - -return 0 ; -} - -#define socket_get (_slot_) PCMCIA_SOCKET_KEY_5V -#define hardware_enable (_slot_)/* No hardware to enable */ -#define hardware_disable (_slot_)/* No hardware to disable */ - -#endif /* CONFIG_RPXCLASSIC */ -/* FADS Boards from Motorola */ #if defined(CONFIG_FADS )
Signature · 1 line
1.7.10.4