diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-02-12 13:36:55 -0700 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-13 15:35:53 +1100 |
| commit | e3aba81d154c53a82e2a7e0ff5e7f1162a53cf27 (patch) | |
| tree | ec6728bd17cef43cf98e7bd37db90133485898bc /drivers | |
| parent | 40d244d69a3871dd05a5fdae29f36823a6ee3e33 (diff) | |
| download | linux-stable-e3aba81d154c53a82e2a7e0ff5e7f1162a53cf27.tar.gz linux-stable-e3aba81d154c53a82e2a7e0ff5e7f1162a53cf27.tar.bz2 linux-stable-e3aba81d154c53a82e2a7e0ff5e7f1162a53cf27.zip | |
[POWERPC] Fixup mp5200 drivers to match device tree changes
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/pata_mpc52xx.c | 6 | ||||
| -rw-r--r-- | drivers/serial/mpc52xx_uart.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c index d7378df44970..29e1809e5ecf 100644 --- a/drivers/ata/pata_mpc52xx.c +++ b/drivers/ata/pata_mpc52xx.c @@ -484,10 +484,8 @@ mpc52xx_ata_resume(struct of_device *op) static struct of_device_id mpc52xx_ata_of_match[] = { { - .compatible = "mpc5200-ata", - }, - { - .compatible = "mpc52xx-ata", + .type = "ata", + .compatible = "mpc5200-ata", }, {}, }; diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 3c4b6c243712..955bbd653e22 100644 --- 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[] = { - { .type = "serial", .compatible = "mpc52xx-psc-uart", }, - { .type = "serial", .compatible = "mpc5200-psc", }, /* Efika only! */ + { .type = "serial", .compatible = "mpc5200-psc-uart", }, {}, }; #endif @@ -1068,7 +1067,7 @@ mpc52xx_uart_of_enumerate(void) 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); } |