[POWERPC] Celleb: Serial I/O update

This is an update for Serial I/O on Celleb.
  - Detection algorithm has been changed

Signed-off-by: Kou Ishizaki <Kou.Ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/celleb/scc_sio.c b/arch/powerpc/platforms/celleb/scc_sio.c
index bb98735ac46f0068c05505880ecc3d6609a05504..610008211ca1018e8ad882fd9b3abd85a30c1233 100644 (file)
--- a/arch/powerpc/platforms/celleb/scc_sio.c
+++ b/arch/powerpc/platforms/celleb/scc_sio.c
@@ -1,7 +1,7 @@
 /*
  * setup serial port in SCC
  *
- * (C) Copyright 2006 TOSHIBA CORPORATION
+ * (C) Copyright 2006-2007 TOSHIBA CORPORATION
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,40 +42,40 @@ static struct {
 static int __init txx9_serial_init(void)
 {
        extern int early_serial_txx9_setup(struct uart_port *port);
-       struct device_node *node;
+       struct device_node *node = NULL;
        int i;
        struct uart_port req;
        struct of_irq irq;
        struct resource res;
 
-       node = of_find_node_by_path("/ioif1/sio");
-       if (!node)
-               return 0;
+       while ((node = of_find_compatible_node(node,
+                               "serial", "toshiba,sio-scc")) != NULL) {
+               for (i = 0; i < ARRAY_SIZE(txx9_scc_tab); i++) {
+                       if (!(txx9_serial_bitmap & (1<<i)))
+                               continue;
 
-       for(i = 0; i < sizeof(txx9_scc_tab)/sizeof(txx9_scc_tab[0]); i++) {
-               if (!(txx9_serial_bitmap & (1<<i)))
-                       continue;
+                       if (of_irq_map_one(node, i, &irq))
+                               continue;
+                       if (of_address_to_resource(node,
+                               txx9_scc_tab[i].index, &res))
+                               continue;
 
-               if (of_irq_map_one(node, i, &irq))
-                       continue;
-               if (of_address_to_resource(node, txx9_scc_tab[i].index, &res))
-                       continue;
-
-               memset(&req, 0, sizeof(req));
-               req.line = i;
-               req.iotype = UPIO_MEM;
-               req.mapbase = res.start + txx9_scc_tab[i].offset;
+                       memset(&req, 0, sizeof(req));
+                       req.line = i;
+                       req.iotype = UPIO_MEM;
+                       req.mapbase = res.start + txx9_scc_tab[i].offset;
 #ifdef CONFIG_SERIAL_TXX9_CONSOLE
-               req.membase = ioremap(req.mapbase, 0x24);
+                       req.membase = ioremap(req.mapbase, 0x24);
 #endif
-               req.irq = irq_create_of_mapping(irq.controller,
-                       irq.specifier, irq.size);
-               req.flags |= UPF_IOREMAP | UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
-               req.uartclk = 83300000;
-               early_serial_txx9_setup(&req);
+                       req.irq = irq_create_of_mapping(irq.controller,
+                               irq.specifier, irq.size);
+                       req.flags |= UPF_IOREMAP | UPF_BUGGY_UART
+                               /*HAVE_CTS_LINE*/;
+                       req.uartclk = 83300000;
+                       early_serial_txx9_setup(&req);
+               }
        }
 
-       of_node_put(node);
        return 0;
 }