summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Machet2008-04-21 23:02:56 +0200
committerPaul Mackerras2008-04-24 12:57:34 +0200
commitdf40a57ef16219e5dee75238559960b1dd459c65 (patch)
tree45b630d3002a8011ba020f82d396c6cee9a64e3c
parent[POWERPC] Initialize all mv64x60 devices even if one fails (diff)
downloadkernel-qcow2-linux-df40a57ef16219e5dee75238559960b1dd459c65.tar.gz
kernel-qcow2-linux-df40a57ef16219e5dee75238559960b1dd459c65.tar.xz
kernel-qcow2-linux-df40a57ef16219e5dee75238559960b1dd459c65.zip
[POWERPC] Fix mv64x60 early console code to use cell-index property
The MPSC driver and prpmc2800.dts have been modified to use property 'cell-index' as the serial port number, but the early serial console driver for the mv64x60 has not been modified to use this new property. This fixes it. Signed-off-by: Remi Machet (rmachet@slac.stanford.edu) Acked-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/sysdev/mv64x60_udbg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mv64x60_udbg.c b/arch/powerpc/sysdev/mv64x60_udbg.c
index ccdb3b0418fc..2792dc8b038c 100644
--- a/arch/powerpc/sysdev/mv64x60_udbg.c
+++ b/arch/powerpc/sysdev/mv64x60_udbg.c
@@ -94,7 +94,7 @@ static void mv64x60_udbg_init(void)
if (!np)
return;
- block_index = of_get_property(np, "block-index", NULL);
+ block_index = of_get_property(np, "cell-index", NULL);
if (!block_index)
goto error;