git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[pandora-kernel.git]
/
drivers
/
serial
/
mpc52xx_uart.c
diff --git
a/drivers/serial/mpc52xx_uart.c
b/drivers/serial/mpc52xx_uart.c
index
3c4b6c2
..
8d24cd5
100644
(file)
--- a/
drivers/serial/mpc52xx_uart.c
+++ b/
drivers/serial/mpc52xx_uart.c
@@
-127,8
+127,7
@@
static irqreturn_t mpc52xx_uart_int(int irq,void *dev_id);
#if defined(CONFIG_PPC_MERGE)
static struct of_device_id mpc52xx_uart_of_match[] = {
#if defined(CONFIG_PPC_MERGE)
static struct of_device_id mpc52xx_uart_of_match[] = {
- { .type = "serial", .compatible = "mpc52xx-psc-uart", },
- { .type = "serial", .compatible = "mpc5200-psc", }, /* Efika only! */
+ { .type = "serial", .compatible = "mpc5200-psc-uart", },
{},
};
#endif
{},
};
#endif
@@
-996,8
+995,10
@@
mpc52xx_uart_of_remove(struct of_device *op)
struct uart_port *port = dev_get_drvdata(&op->dev);
dev_set_drvdata(&op->dev, NULL);
struct uart_port *port = dev_get_drvdata(&op->dev);
dev_set_drvdata(&op->dev, NULL);
- if (port)
+ if (port)
{
uart_remove_one_port(&mpc52xx_uart_driver, port);
uart_remove_one_port(&mpc52xx_uart_driver, port);
+ irq_dispose_mapping(port->irq);
+ }
return 0;
}
return 0;
}
@@
-1068,7
+1069,7
@@
mpc52xx_uart_of_enumerate(void)
continue;
/* Is a particular device number requested? */
continue;
/* Is a particular device number requested? */
- devno = get_property(np, "
device_no
", NULL);
+ devno = get_property(np, "
port-number
", NULL);
mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1);
}
mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1);
}