pcmcia: Remove m8xx_pcmcia driver
This driver doesn't build, and apparently has not built since arch/ppc was removed in 2008 (when mk_int_int_mask was removed from asm/irq.h, among other build errors). A few weeks ago I asked whether anyone was actively maintaining this code, and got no positive response: http://patchwork.ozlabs.org/patch/352082/ So, let's remove it. Signed-off-by: Scott Wood <scottwood@freescale.com> Cc: Vitaly Bordug <vitb@kernel.crashing.org> Cc: linux-pcmcia@lists.infradead.org Cc: Paul Bolle <pebolle@tiscali.nl>
This commit is contained in:
parent
2759a7f13d
commit
39eb56da2b
@ -7,6 +7,4 @@
|
|||||||
#ifndef __CONFIG_8xx_DEFS
|
#ifndef __CONFIG_8xx_DEFS
|
||||||
#define __CONFIG_8xx_DEFS
|
#define __CONFIG_8xx_DEFS
|
||||||
|
|
||||||
extern struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
|
|
||||||
|
|
||||||
#endif /* __CONFIG_8xx_DEFS */
|
#endif /* __CONFIG_8xx_DEFS */
|
||||||
|
@ -28,8 +28,6 @@
|
|||||||
|
|
||||||
#include "mpc8xx.h"
|
#include "mpc8xx.h"
|
||||||
|
|
||||||
struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
|
|
||||||
|
|
||||||
extern int cpm_pic_init(void);
|
extern int cpm_pic_init(void);
|
||||||
extern int cpm_get_irq(void);
|
extern int cpm_get_irq(void);
|
||||||
|
|
||||||
|
@ -46,61 +46,6 @@
|
|||||||
|
|
||||||
static u32 __iomem *bcsr, *bcsr5;
|
static u32 __iomem *bcsr, *bcsr5;
|
||||||
|
|
||||||
#ifdef CONFIG_PCMCIA_M8XX
|
|
||||||
static void pcmcia_hw_setup(int slot, int enable)
|
|
||||||
{
|
|
||||||
if (enable)
|
|
||||||
clrbits32(&bcsr[1], BCSR1_PCCEN);
|
|
||||||
else
|
|
||||||
setbits32(&bcsr[1], BCSR1_PCCEN);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int pcmcia_set_voltage(int slot, int vcc, int vpp)
|
|
||||||
{
|
|
||||||
u32 reg = 0;
|
|
||||||
|
|
||||||
switch (vcc) {
|
|
||||||
case 0:
|
|
||||||
break;
|
|
||||||
case 33:
|
|
||||||
reg |= BCSR1_PCCVCC0;
|
|
||||||
break;
|
|
||||||
case 50:
|
|
||||||
reg |= BCSR1_PCCVCC1;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (vpp) {
|
|
||||||
case 0:
|
|
||||||
break;
|
|
||||||
case 33:
|
|
||||||
case 50:
|
|
||||||
if (vcc == vpp)
|
|
||||||
reg |= BCSR1_PCCVPP1;
|
|
||||||
else
|
|
||||||
return 1;
|
|
||||||
break;
|
|
||||||
case 120:
|
|
||||||
if ((vcc == 33) || (vcc == 50))
|
|
||||||
reg |= BCSR1_PCCVPP0;
|
|
||||||
else
|
|
||||||
return 1;
|
|
||||||
default:
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* first, turn off all power */
|
|
||||||
clrbits32(&bcsr[1], 0x00610000);
|
|
||||||
|
|
||||||
/* enable new powersettings */
|
|
||||||
setbits32(&bcsr[1], reg);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct cpm_pin {
|
struct cpm_pin {
|
||||||
int port, pin, flags;
|
int port, pin, flags;
|
||||||
};
|
};
|
||||||
@ -245,12 +190,6 @@ static void __init mpc885ads_setup_arch(void)
|
|||||||
of_detach_node(np);
|
of_detach_node(np);
|
||||||
of_node_put(np);
|
of_node_put(np);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PCMCIA_M8XX
|
|
||||||
/* Set up board specific hook-ups.*/
|
|
||||||
m8xx_pcmcia_ops.hw_ctrl = pcmcia_hw_setup;
|
|
||||||
m8xx_pcmcia_ops.voltage_set = pcmcia_set_voltage;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init mpc885ads_probe(void)
|
static int __init mpc885ads_probe(void)
|
||||||
|
@ -144,16 +144,6 @@ config TCIC
|
|||||||
"Bridge" is the name used for the hardware inside your computer that
|
"Bridge" is the name used for the hardware inside your computer that
|
||||||
PCMCIA cards are plugged into. If unsure, say N.
|
PCMCIA cards are plugged into. If unsure, say N.
|
||||||
|
|
||||||
config PCMCIA_M8XX
|
|
||||||
tristate "MPC8xx PCMCIA support"
|
|
||||||
depends on PCCARD && PPC && 8xx
|
|
||||||
select PCCARD_IODYN if PCMCIA != n
|
|
||||||
help
|
|
||||||
Say Y here to include support for PowerPC 8xx series PCMCIA
|
|
||||||
controller.
|
|
||||||
|
|
||||||
This driver is also available as a module called m8xx_pcmcia.
|
|
||||||
|
|
||||||
config PCMCIA_ALCHEMY_DEVBOARD
|
config PCMCIA_ALCHEMY_DEVBOARD
|
||||||
tristate "Alchemy Db/Pb1xxx PCMCIA socket services"
|
tristate "Alchemy Db/Pb1xxx PCMCIA socket services"
|
||||||
depends on MIPS_ALCHEMY && PCMCIA
|
depends on MIPS_ALCHEMY && PCMCIA
|
||||||
|
@ -23,7 +23,6 @@ obj-$(CONFIG_PD6729) += pd6729.o
|
|||||||
obj-$(CONFIG_I82365) += i82365.o
|
obj-$(CONFIG_I82365) += i82365.o
|
||||||
obj-$(CONFIG_I82092) += i82092.o
|
obj-$(CONFIG_I82092) += i82092.o
|
||||||
obj-$(CONFIG_TCIC) += tcic.o
|
obj-$(CONFIG_TCIC) += tcic.o
|
||||||
obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o
|
|
||||||
obj-$(CONFIG_PCMCIA_SOC_COMMON) += soc_common.o
|
obj-$(CONFIG_PCMCIA_SOC_COMMON) += soc_common.o
|
||||||
obj-$(CONFIG_PCMCIA_SA11XX_BASE) += sa11xx_base.o
|
obj-$(CONFIG_PCMCIA_SA11XX_BASE) += sa11xx_base.o
|
||||||
obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o
|
obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user