lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SERIAL] serial_cs: add configuration quirk

Browse Source 
Add a quirk primerily to handle tweaks to the link->conf structure,
eg as required for Socket cards.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2006-09-16 23:00:54 +01:00
committed by Russell King
parent 7ef057fa70
commit efd92dfaad
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/serial/serial_cs.c
View File

@@ -84,6 +84,7 @@ struct serial_quirk {
unsigned int manfid; unsigned int manfid;
unsigned int prodid; unsigned int prodid;
int multi; /* 1 = multifunction, > 1 = # ports */ int multi; /* 1 = multifunction, > 1 = # ports */
void (*config)(struct pcmcia_device *);
void (*wakeup)(struct pcmcia_device *); void (*wakeup)(struct pcmcia_device *);
int (*post)(struct pcmcia_device *); int (*post)(struct pcmcia_device *);
}; };
@@ -164,6 +165,19 @@ static void quirk_wakeup_possio_gcc(struct pcmcia_device *link)
outb(0xC, ctrl + 1); outb(0xC, ctrl + 1);
} }
/*
* Socket Dual IO: this enables irq's for second port
*/
static void quirk_config_socket(struct pcmcia_device *link)
{
struct serial_info *info = link->priv;
if (info->multi) {
link->conf.Present |= PRESENT_EXT_STATUS;
link->conf.ExtStatus = ESR_REQ_ATTN_ENA;
}
}
static const struct serial_quirk quirks[] = { static const struct serial_quirk quirks[] = {
{ {
.manfid = MANFID_IBM, .manfid = MANFID_IBM,
@@ -208,6 +222,12 @@ static const struct serial_quirk quirks[] = {
.manfid = MANFID_SOCKET, .manfid = MANFID_SOCKET,
.prodid = PRODID_SOCKET_DUAL_RS232, .prodid = PRODID_SOCKET_DUAL_RS232,
.multi = 2, .multi = 2,
.config = quirk_config_socket,
}, {
.manfid = MANFID_SOCKET,
.prodid = ~0,
.multi = -1,
.config = quirk_config_socket,
} }
}; };
@@ -504,6 +524,13 @@ next_entry:
} }
if (info->multi && (info->manfid == MANFID_3COM)) if (info->multi && (info->manfid == MANFID_3COM))
link->conf.ConfigIndex &= ~(0x08); link->conf.ConfigIndex &= ~(0x08);
/*
* Apply any configuration quirks.
*/
if (info->quirk && info->quirk->config)
info->quirk->config(link);
i = pcmcia_request_configuration(link, &link->conf); i = pcmcia_request_configuration(link, &link->conf);
if (i != CS_SUCCESS) { if (i != CS_SUCCESS) {
cs_error(link, RequestConfiguration, i); cs_error(link, RequestConfiguration, i);
@@ -592,11 +619,13 @@ static int multi_config(struct pcmcia_device * link)
cs_error(link, RequestIRQ, i); cs_error(link, RequestIRQ, i);
link->irq.AssignedIRQ = 0; link->irq.AssignedIRQ = 0;
} }
/* Socket Dual IO: this enables irq's for second port */
if (info->multi && (info->manfid == MANFID_SOCKET)) { /*
link->conf.Present |= PRESENT_EXT_STATUS; * Apply any configuration quirks.
link->conf.ExtStatus = ESR_REQ_ATTN_ENA; */
} if (info->quirk && info->quirk->config)
info->quirk->config(link);
i = pcmcia_request_configuration(link, &link->conf); i = pcmcia_request_configuration(link, &link->conf);
if (i != CS_SUCCESS) { if (i != CS_SUCCESS) {
cs_error(link, RequestConfiguration, i); cs_error(link, RequestConfiguration, i);