diff options
| author | Mark A. Greer <mgreer@mvista.com> | 2008-04-07 18:09:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-15 07:21:24 -0400 |
| commit | a1810b44c2d52392cd63e17fc208783cf6be6215 (patch) | |
| tree | b2484650448a41aaf16664933b928f8c74fc8edd /arch/powerpc/boot/serial.c | |
| parent | fb9d93de6049922c4d46cc2dc9d2eeec07369e7f (diff) | |
[POWERPC] mv64x60: Fix FDT compatible names: mv64x60 => mv64360
Compatible names should refer to a specific version of the hardware,
without wildcards. Change each instance of mv64x60 to mv64360, which
is the oldest version we currently support.
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot/serial.c')
| -rw-r--r-- | arch/powerpc/boot/serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c index 9960421eb6b9..8b3607cb53fb 100644 --- a/arch/powerpc/boot/serial.c +++ b/arch/powerpc/boot/serial.c | |||
| @@ -119,7 +119,7 @@ int serial_console_init(void) | |||
| 119 | 119 | ||
| 120 | if (dt_is_compatible(devp, "ns16550")) | 120 | if (dt_is_compatible(devp, "ns16550")) |
| 121 | rc = ns16550_console_init(devp, &serial_cd); | 121 | rc = ns16550_console_init(devp, &serial_cd); |
| 122 | else if (dt_is_compatible(devp, "marvell,mpsc")) | 122 | else if (dt_is_compatible(devp, "marvell,mv64360-mpsc")) |
| 123 | rc = mpsc_console_init(devp, &serial_cd); | 123 | rc = mpsc_console_init(devp, &serial_cd); |
| 124 | else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") || | 124 | else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") || |
| 125 | dt_is_compatible(devp, "fsl,cpm1-smc-uart") || | 125 | dt_is_compatible(devp, "fsl,cpm1-smc-uart") || |