Merge bk://are.twiddle.net/axp-2.5

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

arch/alpha/kernel/core_marvel.c

@@ -1076,7 +1076,7 @@ marvel_agp_info(void)
 	/*
 	 * Fill it in.
 	 */
-	agp->type = 0 /* FIXME: ALPHA_CORE_AGP */;
+	agp->type = ALPHA_CORE_AGP;
 	agp->hose = hose;
 	agp->private = NULL;
 	agp->ops = &marvel_agp_ops;

arch/alpha/kernel/core_titan.c

@@ -764,7 +764,7 @@ titan_agp_info(void)
 	/*
 	 * Fill it in.
 	 */
-	agp->type = 0 /* FIXME: ALPHA_CORE_AGP */;
+	agp->type = ALPHA_CORE_AGP;
 	agp->hose = hose;
 	agp->private = port;
 	agp->ops = &titan_agp_ops;

arch/alpha/kernel/pci.c

@@ -393,13 +393,10 @@ pcibios_set_master(struct pci_dev *dev)
 }
 
 static void __init
-pcibios_claim_console_setup(void)
+pcibios_claim_one_bus(struct pci_bus *b)
 {
-	struct list_head *lb;
-
-	for(lb = pci_root_buses.next; lb != &pci_root_buses; lb = lb->next) {
-		struct pci_bus *b = pci_bus_b(lb);
 	struct list_head *ld;
+	struct pci_bus *child_bus;
 
 	for (ld = b->devices.next; ld != &b->devices; ld = ld->next) {
 		struct pci_dev *dev = pci_dev_b(ld);
@@ -413,6 +410,19 @@ pcibios_claim_console_setup(void)
 			pci_claim_resource(dev, i);
 		}
 	}
+
+	list_for_each_entry(child_bus, &b->children, node)
+		pcibios_claim_one_bus(child_bus);
+}
+
+static void __init
+pcibios_claim_console_setup(void)
+{
+	struct list_head *lb;
+
+	for(lb = pci_root_buses.next; lb != &pci_root_buses; lb = lb->next) {
+		struct pci_bus *b = pci_bus_b(lb);
+		pcibios_claim_one_bus(b);
 	}
 }
 

arch/alpha/kernel/sys_nautilus.c

@@ -78,6 +78,8 @@ void
 nautilus_kill_arch(int mode)
 {
 	struct pci_bus *bus = pci_isa_hose->bus;
+	u32 pmuport;
+	int off;
 
 	switch (mode) {
 	case LINUX_REBOOT_CMD_RESTART:
@@ -92,14 +94,18 @@ nautilus_kill_arch(int mode)
 		break;
 
 	case LINUX_REBOOT_CMD_POWER_OFF:
-		{
-			u32 pmuport;
+		/* Assume M1543C */
+		off = 0x2000;		/* SLP_TYPE = 0, SLP_EN = 1 */
 		pci_bus_read_config_dword(bus, 0x88, 0x10, &pmuport);
+		if (!pmuport) {
+			/* M1535D/D+ */
+			off = 0x3400;	/* SLP_TYPE = 5, SLP_EN = 1 */
+			pci_bus_read_config_dword(bus, 0x88, 0xe0, &pmuport);
+		}
 		pmuport &= 0xfffe;
-			outl(0xffff, pmuport); /* clear pending events */
-			outw(0x2000, pmuport+4); /* power off */
+		outw(0xffff, pmuport);	/* Clear pending events. */
+		outw(off, pmuport + 4);
 		/* NOTREACHED */
-		}
 		break;
 	}
 }