Merge bk://kernel.bkbits.net/davem/sparc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

drivers/serial/sunsab.c

@@ -583,10 +583,22 @@ static void sunsab_shutdown(struct uart_port *port)
 	tmp &= ~SAB82532_MODE_RAC;
 	writeb(tmp, &up->regs->rw.mode);
 
+	/*
+	 * XXX FIXME
+	 *
+	 * If the chip is powered down here the system hangs/crashes during
+	 * reboot or shutdown.  This needs to be investigated further,
+	 * similar behaviour occurs in 2.4 when the driver is configured
+	 * as a module only.  One hint may be that data is sometimes
+	 * transmitted at 9600 baud during shutdown (regardless of the
+	 * speed the chip was configured for when the port was open).
+	 */
+#if 0
 	/* Power Down */	
 	tmp = readb(&up->regs->rw.ccr0);
 	tmp &= ~SAB82532_CCR0_PU;
 	writeb(tmp, &up->regs->rw.ccr0);
+#endif
 
 	spin_unlock_irqrestore(&up->port.lock, flags);
 }

drivers/serial/sunzilog.c

@@ -1036,22 +1036,10 @@ static void __init sunzilog_alloc_tables(void)
 /* We used to attempt to use the address property of the Zilog device node
  * but that totally is not necessary on sparc64.
  */
-static struct zilog_layout * __init get_zs_sun4u(int chip, int node)
+static struct zilog_layout * __init get_zs_sun4u(int chip, int zsnode)
 {
-	unsigned long mapped_addr = 0xdeadbeefUL;
+	unsigned long mapped_addr;
 	unsigned int sun4u_ino;
-	int zsnode, seen;
-
-	zsnode = node;
-	seen = 0;
-	while (zsnode) {
-		int slave;
-
-		zsnode = prom_searchsiblings(zsnode, "zs");
-		if (zsnode == 0 || zsnode == -1)
-			break;
-		slave = prom_getintdefault(zsnode, "slave", -1);
-		if ((slave == chip) || (seen == chip)) {
 	struct sbus_bus *sbus = NULL;
 	struct sbus_dev *sdev = NULL;
 	int err;
@@ -1111,16 +1099,6 @@ static struct zilog_layout * __init get_zs_sun4u(int chip, int node)
 			zilog_irq = sbus_build_irq(sbus_root, sun4u_ino);
 		}
 	}
-			break;
-		}
-		zsnode = prom_getsibling(zsnode);
-		seen++;
-	}
-
-	if (zsnode == 0 || zsnode == -1) {
-		prom_printf("SunZilog: Cannot find Zilog %d in get_zs_sun4u.\n", chip);
-		prom_halt();
-	}
 
 	return (struct zilog_layout *) mapped_addr;
 }