Skip to content

L
linux
Commit 9493b334 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Russell King
Browse files
Options

[PCMCIA] i82365 depends on ISA. 

The i82365 doesn't work unless CONFIG_ISA is set -- see this from
i82365_init:

...

    sockets = 0;

#ifdef CONFIG_ISA
    isa_probe();
#endif

    if (sockets == 0) {
        printk("not found.\n");
        driver_unregister(&i82365_driver);
        return -ENODEV;
    }

...

So, remove all instances of CONFIG_ISA from i82365.c and add a
dependency to the Kconfig file.
parent 91a32a40
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 66 deletions
drivers/pcmcia/Kconfig
View file @ 9493b334
...@@ -63,7 +63,7 @@ config I82092 ...@@ -63,7 +63,7 @@ config I82092
config I82365 config I82365
tristate "i82365 compatible bridge support" tristate "i82365 compatible bridge support"
depends on PCMCIA depends on PCMCIA && ISA
help help
Say Y here to include support for ISA-bus PCMCIA host bridges that Say Y here to include support for ISA-bus PCMCIA host bridges that
are register compatible with the Intel i82365. These are found on are register compatible with the Intel i82365. These are found on
......
drivers/pcmcia/i82365.c
View file @ 9493b334
...@@ -91,7 +91,6 @@ static inline int _check_irq(int irq, int flags) ...@@ -91,7 +91,6 @@ static inline int _check_irq(int irq, int flags)
/* Parameters that can be set with 'insmod' */ /* Parameters that can be set with 'insmod' */
#ifdef CONFIG_ISA
/* Default base address for i82365sl and other ISA chips */ /* Default base address for i82365sl and other ISA chips */
static int i365_base = 0x3e0; static int i365_base = 0x3e0;
/* Should we probe at 0x3e2 for an extra ISA controller? */ /* Should we probe at 0x3e2 for an extra ISA controller? */
...@@ -103,7 +102,6 @@ static u_int irq_mask = 0xffff; ...@@ -103,7 +102,6 @@ static u_int irq_mask = 0xffff;
static int irq_list[16] = { -1 }; static int irq_list[16] = { -1 };
/* The card status change interrupt -- 0 means autoselect */ /* The card status change interrupt -- 0 means autoselect */
static int cs_irq = 0; static int cs_irq = 0;
#endif
/* Probe for safe interrupts? */ /* Probe for safe interrupts? */
static int do_scan = 1; static int do_scan = 1;
...@@ -122,14 +120,11 @@ static int setup_time = -1; ...@@ -122,14 +120,11 @@ static int setup_time = -1;
static int cmd_time = -1; static int cmd_time = -1;
static int recov_time = -1; static int recov_time = -1;
#ifdef CONFIG_ISA
/* Vadem options */ /* Vadem options */
static int async_clock = -1; static int async_clock = -1;
static int cable_mode = -1; static int cable_mode = -1;
static int wakeup = 0; static int wakeup = 0;
#endif
#ifdef CONFIG_ISA
MODULE_PARM(i365_base, "i"); MODULE_PARM(i365_base, "i");
MODULE_PARM(ignore, "i"); MODULE_PARM(ignore, "i");
MODULE_PARM(extra_sockets, "i"); MODULE_PARM(extra_sockets, "i");
...@@ -139,7 +134,6 @@ MODULE_PARM(cs_irq, "i"); ...@@ -139,7 +134,6 @@ MODULE_PARM(cs_irq, "i");
MODULE_PARM(async_clock, "i"); MODULE_PARM(async_clock, "i");
MODULE_PARM(cable_mode, "i"); MODULE_PARM(cable_mode, "i");
MODULE_PARM(wakeup, "i"); MODULE_PARM(wakeup, "i");
#endif
MODULE_PARM(do_scan, "i"); MODULE_PARM(do_scan, "i");
MODULE_PARM(poll_interval, "i"); MODULE_PARM(poll_interval, "i");
...@@ -192,15 +186,10 @@ static socket_info_t socket[8] = { ...@@ -192,15 +186,10 @@ static socket_info_t socket[8] = {
/* Default ISA interrupt mask */ /* Default ISA interrupt mask */
#define I365_MASK 0xdeb8 /* irq 15,14,12,11,10,9,7,5,4,3 */ #define I365_MASK 0xdeb8 /* irq 15,14,12,11,10,9,7,5,4,3 */
#ifdef CONFIG_ISA
static int grab_irq; static int grab_irq;
static spinlock_t isa_lock = SPIN_LOCK_UNLOCKED; static spinlock_t isa_lock = SPIN_LOCK_UNLOCKED;
#define ISA_LOCK(n, f) spin_lock_irqsave(&isa_lock, f) #define ISA_LOCK(n, f) spin_lock_irqsave(&isa_lock, f)
#define ISA_UNLOCK(n, f) spin_unlock_irqrestore(&isa_lock, f) #define ISA_UNLOCK(n, f) spin_unlock_irqrestore(&isa_lock, f)
#else
#define ISA_LOCK(n, f) do { } while (0)
#define ISA_UNLOCK(n, f) do { } while (0)
#endif
static struct timer_list poll_timer; static struct timer_list poll_timer;
...@@ -211,13 +200,11 @@ static struct timer_list poll_timer; ...@@ -211,13 +200,11 @@ static struct timer_list poll_timer;
PCI_COMMAND_MASTER|PCI_COMMAND_WAIT) PCI_COMMAND_MASTER|PCI_COMMAND_WAIT)
/* These definitions must match the pcic table! */ /* These definitions must match the pcic table! */
#ifdef CONFIG_ISA
typedef enum pcic_id { typedef enum pcic_id {
IS_I82365A, IS_I82365B, IS_I82365DF, IS_I82365A, IS_I82365B, IS_I82365DF,
IS_IBM, IS_RF5Cx96, IS_VLSI, IS_VG468, IS_VG469, IS_IBM, IS_RF5Cx96, IS_VLSI, IS_VG468, IS_VG469,
IS_PD6710, IS_PD672X, IS_VT83C469, IS_PD6710, IS_PD672X, IS_VT83C469,
} pcic_id; } pcic_id;
#endif
/* Flags for classifying groups of controllers */ /* Flags for classifying groups of controllers */
#define IS_VADEM 0x0001 #define IS_VADEM 0x0001
...@@ -239,7 +226,6 @@ typedef struct pcic_t { ...@@ -239,7 +226,6 @@ typedef struct pcic_t {
} pcic_t; } pcic_t;
static pcic_t pcic[] = { static pcic_t pcic[] = {
#ifdef CONFIG_ISA
{ "Intel i82365sl A step", 0 }, { "Intel i82365sl A step", 0 },
{ "Intel i82365sl B step", 0 }, { "Intel i82365sl B step", 0 },
{ "Intel i82365sl DF", IS_DF_PWR }, { "Intel i82365sl DF", IS_DF_PWR },
...@@ -251,7 +237,6 @@ static pcic_t pcic[] = { ...@@ -251,7 +237,6 @@ static pcic_t pcic[] = {
{ "Cirrus PD6710", IS_CIRRUS }, { "Cirrus PD6710", IS_CIRRUS },
{ "Cirrus PD672x", IS_CIRRUS }, { "Cirrus PD672x", IS_CIRRUS },
{ "VIA VT83C469", IS_CIRRUS|IS_VIA }, { "VIA VT83C469", IS_CIRRUS|IS_VIA },
#endif
}; };
#define PCIC_COUNT (sizeof(pcic)/sizeof(pcic_t)) #define PCIC_COUNT (sizeof(pcic)/sizeof(pcic_t))
...@@ -423,8 +408,6 @@ static u_int __init cirrus_set_opts(u_short s, char *buf) ...@@ -423,8 +408,6 @@ static u_int __init cirrus_set_opts(u_short s, char *buf)
======================================================================*/ ======================================================================*/
#ifdef CONFIG_ISA
static void vg46x_get_state(u_short s) static void vg46x_get_state(u_short s)
{ {
vg46x_state_t *p = &socket[s].state.vg46x; vg46x_state_t *p = &socket[s].state.vg46x;
...@@ -466,9 +449,6 @@ static u_int __init vg46x_set_opts(u_short s, char *buf) ...@@ -466,9 +449,6 @@ static u_int __init vg46x_set_opts(u_short s, char *buf)
return 0xffff; return 0xffff;
} }
#endif
/*====================================================================== /*======================================================================
Generic routines to get and set controller options Generic routines to get and set controller options
...@@ -480,10 +460,8 @@ static void get_bridge_state(u_short s) ...@@ -480,10 +460,8 @@ static void get_bridge_state(u_short s)
socket_info_t *t = &socket[s]; socket_info_t *t = &socket[s];
if (t->flags & IS_CIRRUS) if (t->flags & IS_CIRRUS)
cirrus_get_state(s); cirrus_get_state(s);
#ifdef CONFIG_ISA
else if (t->flags & IS_VADEM) else if (t->flags & IS_VADEM)
vg46x_get_state(s); vg46x_get_state(s);
#endif
} }
static void set_bridge_state(u_short s) static void set_bridge_state(u_short s)
...@@ -496,10 +474,8 @@ static void set_bridge_state(u_short s) ...@@ -496,10 +474,8 @@ static void set_bridge_state(u_short s)
i365_set(s, I365_GENCTL, 0x00); i365_set(s, I365_GENCTL, 0x00);
} }
i365_bflip(s, I365_INTCTL, I365_INTR_ENA, t->intr); i365_bflip(s, I365_INTCTL, I365_INTR_ENA, t->intr);
#ifdef CONFIG_ISA
if (t->flags & IS_VADEM) if (t->flags & IS_VADEM)
vg46x_set_state(s); vg46x_set_state(s);
#endif
} }
static u_int __init set_bridge_opts(u_short s, u_short ns) static u_int __init set_bridge_opts(u_short s, u_short ns)
...@@ -517,10 +493,8 @@ static u_int __init set_bridge_opts(u_short s, u_short ns) ...@@ -517,10 +493,8 @@ static u_int __init set_bridge_opts(u_short s, u_short ns)
get_bridge_state(i); get_bridge_state(i);
if (socket[i].flags & IS_CIRRUS) if (socket[i].flags & IS_CIRRUS)
m = cirrus_set_opts(i, buf); m = cirrus_set_opts(i, buf);
#ifdef CONFIG_ISA
else if (socket[i].flags & IS_VADEM) else if (socket[i].flags & IS_VADEM)
m = vg46x_set_opts(i, buf); m = vg46x_set_opts(i, buf);
#endif
set_bridge_state(i); set_bridge_state(i);
printk(KERN_INFO " host opts [%d]:%s\n", i, printk(KERN_INFO " host opts [%d]:%s\n", i,
(*buf) ? buf : " none"); (*buf) ? buf : " none");
...@@ -573,7 +547,6 @@ static u_int __init test_irq(u_short sock, int irq) ...@@ -573,7 +547,6 @@ static u_int __init test_irq(u_short sock, int irq)
return (irq_hits != 1); return (irq_hits != 1);
} }
#ifdef CONFIG_ISA
static u_int __init isa_scan(u_short sock, u_int mask0) static u_int __init isa_scan(u_short sock, u_int mask0)
{ {
...@@ -619,7 +592,6 @@ static u_int __init isa_scan(u_short sock, u_int mask0) ...@@ -619,7 +592,6 @@ static u_int __init isa_scan(u_short sock, u_int mask0)
return mask1; return mask1;
} }
#endif /* CONFIG_ISA */
/*====================================================================*/ /*====================================================================*/
...@@ -632,7 +604,6 @@ static int to_cycles(int ns) ...@@ -632,7 +604,6 @@ static int to_cycles(int ns)
/*====================================================================*/ /*====================================================================*/
#ifdef CONFIG_ISA
static int __init identify(u_short port, u_short sock) static int __init identify(u_short port, u_short sock)
{ {
...@@ -693,8 +664,6 @@ static int __init identify(u_short port, u_short sock) ...@@ -693,8 +664,6 @@ static int __init identify(u_short port, u_short sock)
return type; return type;
} /* identify */ } /* identify */
#endif
/*====================================================================== /*======================================================================
See if a card is present, powered up, in IO mode, and already See if a card is present, powered up, in IO mode, and already
...@@ -750,23 +719,17 @@ static void __init add_pcic(int ns, int type) ...@@ -750,23 +719,17 @@ static void __init add_pcic(int ns, int type)
t->ioaddr, t->psock*0x40); t->ioaddr, t->psock*0x40);
printk(", %d socket%s\n", ns, ((ns > 1) ? "s" : "")); printk(", %d socket%s\n", ns, ((ns > 1) ? "s" : ""));
#ifdef CONFIG_ISA
/* Set host options, build basic interrupt mask */ /* Set host options, build basic interrupt mask */
if (irq_list[0] == -1) if (irq_list[0] == -1)
mask = irq_mask; mask = irq_mask;
else else
for (i = mask = 0; i < 16; i++) for (i = mask = 0; i < 16; i++)
mask |= (1<<irq_list[i]); mask |= (1<<irq_list[i]);
#endif
mask &= I365_MASK & set_bridge_opts(base, ns); mask &= I365_MASK & set_bridge_opts(base, ns);
#ifdef CONFIG_ISA
/* Scan for ISA interrupts */ /* Scan for ISA interrupts */
mask = isa_scan(base, mask); mask = isa_scan(base, mask);
#else
printk(KERN_INFO " PCI card interrupts,"); printk(KERN_INFO " PCI card interrupts,");
#endif
#ifdef CONFIG_ISA
/* Poll if only two interrupts available */ /* Poll if only two interrupts available */
if (!use_pci && !poll_interval) { if (!use_pci && !poll_interval) {
u_int tmp = (mask & 0xff20); u_int tmp = (mask & 0xff20);
...@@ -788,7 +751,6 @@ static void __init add_pcic(int ns, int type) ...@@ -788,7 +751,6 @@ static void __init add_pcic(int ns, int type)
printk(" status change on irq %d\n", cs_irq); printk(" status change on irq %d\n", cs_irq);
} }
} }
#endif
if (!use_pci && !isa_irq) { if (!use_pci && !isa_irq) {
if (poll_interval == 0) if (poll_interval == 0)
...@@ -811,7 +773,6 @@ static void __init add_pcic(int ns, int type) ...@@ -811,7 +773,6 @@ static void __init add_pcic(int ns, int type)
/*====================================================================*/ /*====================================================================*/
#ifdef CONFIG_ISA
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static struct isapnp_device_id id_table[] __initdata = { static struct isapnp_device_id id_table[] __initdata = {
...@@ -904,7 +865,6 @@ static void __init isa_probe(void) ...@@ -904,7 +865,6 @@ static void __init isa_probe(void)
} }
} }
#endif
/*====================================================================*/ /*====================================================================*/
...@@ -942,9 +902,7 @@ static irqreturn_t pcic_interrupt(int irq, void *dev, ...@@ -942,9 +902,7 @@ static irqreturn_t pcic_interrupt(int irq, void *dev,
{ {
int i, j, csc; int i, j, csc;
u_int events, active; u_int events, active;
#ifdef CONFIG_ISA
u_long flags = 0; u_long flags = 0;
#endif
int handled = 0; int handled = 0;
DEBUG(4, "i82365: pcic_interrupt(%d)\n", irq); DEBUG(4, "i82365: pcic_interrupt(%d)\n", irq);
...@@ -1052,7 +1010,6 @@ static int i365_get_status(u_short sock, u_int *value) ...@@ -1052,7 +1010,6 @@ static int i365_get_status(u_short sock, u_int *value)
*value |= (status & I365_CS_READY) ? SS_READY : 0; *value |= (status & I365_CS_READY) ? SS_READY : 0;
*value |= (status & I365_CS_POWERON) ? SS_POWERON : 0; *value |= (status & I365_CS_POWERON) ? SS_POWERON : 0;
#ifdef CONFIG_ISA
if (socket[sock].type == IS_VG469) { if (socket[sock].type == IS_VG469) {
status = i365_get(sock, VG469_VSENSE); status = i365_get(sock, VG469_VSENSE);
if (socket[sock].psock & 1) { if (socket[sock].psock & 1) {
...@@ -1063,7 +1020,6 @@ static int i365_get_status(u_short sock, u_int *value) ...@@ -1063,7 +1020,6 @@ static int i365_get_status(u_short sock, u_int *value)
*value |= (status & VG469_VSENSE_A_VS2) ? 0 : SS_XVCARD; *value |= (status & VG469_VSENSE_A_VS2) ? 0 : SS_XVCARD;
} }
} }
#endif
DEBUG(1, "i82365: GetStatus(%d) = %#4.4x\n", sock, *value); DEBUG(1, "i82365: GetStatus(%d) = %#4.4x\n", sock, *value);
return 0; return 0;
...@@ -1355,9 +1311,7 @@ static int proc_read_exca(char *buf, char **start, off_t pos, ...@@ -1355,9 +1311,7 @@ static int proc_read_exca(char *buf, char **start, off_t pos,
char *p = buf; char *p = buf;
int i, top; int i, top;
#ifdef CONFIG_ISA
u_long flags = 0; u_long flags = 0;
#endif
ISA_LOCK(sock, flags); ISA_LOCK(sock, flags);
top = 0x40; top = 0x40;
for (i = 0; i < top; i += 4) { for (i = 0; i < top; i += 4) {
...@@ -1402,15 +1356,8 @@ static void pcic_proc_remove(u_short sock) ...@@ -1402,15 +1356,8 @@ static void pcic_proc_remove(u_short sock)
/*====================================================================*/ /*====================================================================*/
/* /* this is horribly ugly... proper locking needs to be done here at
* The locking is rather broken. Why do we only lock for ISA, not for * some time... */
* all other cases? If there are reasons to lock, we should lock. Not
* this silly conditional.
*
* Plan: make it bug-for-bug compatible with the old stuff, and clean
* it up when the infrastructure is done.
*/
#ifdef CONFIG_ISA
#define LOCKED(x) do { \ #define LOCKED(x) do { \
int retval; \ int retval; \
unsigned long flags; \ unsigned long flags; \
...@@ -1419,9 +1366,6 @@ static void pcic_proc_remove(u_short sock) ...@@ -1419,9 +1366,6 @@ static void pcic_proc_remove(u_short sock)
spin_unlock_irqrestore(&isa_lock, flags); \ spin_unlock_irqrestore(&isa_lock, flags); \
return retval; \ return retval; \
} while (0) } while (0)
#else
#define LOCKED(x) return x
#endif
static int pcic_get_status(struct pcmcia_socket *s, u_int *value) static int pcic_get_status(struct pcmcia_socket *s, u_int *value)
...@@ -1547,9 +1491,7 @@ static int __init init_i82365(void) ...@@ -1547,9 +1491,7 @@ static int __init init_i82365(void)
printk(KERN_INFO "Intel PCIC probe: "); printk(KERN_INFO "Intel PCIC probe: ");
sockets = 0; sockets = 0;
#ifdef CONFIG_ISA
isa_probe(); isa_probe();
#endif
if (sockets == 0) { if (sockets == 0) {
printk("not found.\n"); printk("not found.\n");
...@@ -1560,10 +1502,8 @@ static int __init init_i82365(void) ...@@ -1560,10 +1502,8 @@ static int __init init_i82365(void)
platform_device_register(&i82365_device); platform_device_register(&i82365_device);
/* Set up interrupt handler(s) */ /* Set up interrupt handler(s) */
#ifdef CONFIG_ISA
if (grab_irq != 0) if (grab_irq != 0)
request_irq(cs_irq, pcic_interrupt, 0, "i82365", pcic_interrupt); request_irq(cs_irq, pcic_interrupt, 0, "i82365", pcic_interrupt);
#endif
/* register sockets with the pcmcia core */ /* register sockets with the pcmcia core */
for (i = 0; i < sockets; i++) { for (i = 0; i < sockets; i++) {
...@@ -1603,16 +1543,14 @@ static void __exit exit_i82365(void) ...@@ -1603,16 +1543,14 @@ static void __exit exit_i82365(void)
platform_device_unregister(&i82365_device); platform_device_unregister(&i82365_device);
if (poll_interval != 0) if (poll_interval != 0)
del_timer_sync(&poll_timer); del_timer_sync(&poll_timer);
#ifdef CONFIG_ISA
if (grab_irq != 0) if (grab_irq != 0)
free_irq(cs_irq, pcic_interrupt); free_irq(cs_irq, pcic_interrupt);
#endif
for (i = 0; i < sockets; i++) { for (i = 0; i < sockets; i++) {
/* Turn off all interrupt sources! */ /* Turn off all interrupt sources! */
i365_set(i, I365_CSCINT, 0); i365_set(i, I365_CSCINT, 0);
release_region(socket[i].ioaddr, 2); release_region(socket[i].ioaddr, 2);
} }
#if defined(CONFIG_ISA) && defined(__ISAPNP__) #ifdef __ISAPNP__
if (i82365_pnpdev) if (i82365_pnpdev)
pnp_disable_dev(i82365_pnpdev); pnp_disable_dev(i82365_pnpdev);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7