Merge branch 'for-2.6.23' into merge

3 files changed, 16 insertions, 54 deletions

diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig
index 5b7afe50039a..055990ca8ce6 100644
--- a/arch/powerpc/platforms/powermac/Kconfig
+++ b/arch/powerpc/platforms/powermac/Kconfig
@@ -2,6 +2,7 @@ config PPC_PMAC
         bool "Apple PowerMac based machines"
         depends on PPC_MULTIPLATFORM
         select MPIC
+        select PCI
         select PPC_INDIRECT_PCI if PPC32
         select PPC_MPC106 if PPC32
         select PPC_NATIVE
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index 3f507ab9c5e5..efdf5eb81ecc 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -42,6 +42,7 @@
 #include <linux/interrupt.h>
 #include <linux/completion.h>
 #include <linux/timer.h>
+#include <linux/mutex.h>
 #include <asm/keylargo.h>
 #include <asm/uninorth.h>
 #include <asm/io.h>
@@ -84,7 +85,7 @@ struct pmac_i2c_bus
         void                    *hostdata;
         int                     channel;        /* some hosts have multiple */
         int                     mode;           /* current mode */
-        struct semaphore        sem;
+        struct mutex            mutex;
         int                     opened;
         int                     polled;         /* open mode */
         struct platform_device  *platform_dev;
@@ -104,7 +105,7 @@ static LIST_HEAD(pmac_i2c_busses);
 
 struct pmac_i2c_host_kw
 {
-        struct semaphore        mutex;          /* Access mutex for use by
+        struct mutex            mutex;          /* Access mutex for use by
                                                  * i2c-keywest */
         void __iomem            *base;          /* register base address */
         int                     bsteps;         /* register stepping */
@@ -375,14 +376,14 @@ static void kw_i2c_timeout(unsigned long data)
 static int kw_i2c_open(struct pmac_i2c_bus *bus)
 {
         struct pmac_i2c_host_kw *host = bus->hostdata;
-        down(&host->mutex);
+        mutex_lock(&host->mutex);
         return 0;
 }
 
 static void kw_i2c_close(struct pmac_i2c_bus *bus)
 {
         struct pmac_i2c_host_kw *host = bus->hostdata;
-        up(&host->mutex);
+        mutex_unlock(&host->mutex);
 }
 
 static int kw_i2c_xfer(struct pmac_i2c_bus *bus, u8 addrdir, int subsize,
@@ -498,7 +499,7 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
                 kfree(host);
                 return NULL;
         }
-        init_MUTEX(&host->mutex);
+        mutex_init(&host->mutex);
         init_completion(&host->complete);
         spin_lock_init(&host->lock);
         init_timer(&host->timeout_timer);
@@ -571,7 +572,7 @@ static void __init kw_i2c_add(struct pmac_i2c_host_kw *host,
         bus->open = kw_i2c_open;
         bus->close = kw_i2c_close;
         bus->xfer = kw_i2c_xfer;
-        init_MUTEX(&bus->sem);
+        mutex_init(&bus->mutex);
         if (controller == busnode)
                 bus->flags = pmac_i2c_multibus;
         list_add(&bus->link, &pmac_i2c_busses);
@@ -798,7 +799,7 @@ static void __init pmu_i2c_probe(void)
                 bus->mode = pmac_i2c_mode_std;
                 bus->hostdata = bus + 1;
                 bus->xfer = pmu_i2c_xfer;
-                init_MUTEX(&bus->sem);
+                mutex_init(&bus->mutex);
                 bus->flags = pmac_i2c_multibus;
                 list_add(&bus->link, &pmac_i2c_busses);
 
@@ -921,7 +922,7 @@ static void __init smu_i2c_probe(void)
                 bus->mode = pmac_i2c_mode_std;
                 bus->hostdata = bus + 1;
                 bus->xfer = smu_i2c_xfer;
-                init_MUTEX(&bus->sem);
+                mutex_init(&bus->mutex);
                 bus->flags = 0;
                 list_add(&bus->link, &pmac_i2c_busses);
 
@@ -1093,13 +1094,13 @@ int pmac_i2c_open(struct pmac_i2c_bus *bus, int polled)
 {
         int rc;
 
-        down(&bus->sem);
+        mutex_lock(&bus->mutex);
         bus->polled = polled || pmac_i2c_force_poll;
         bus->opened = 1;
         bus->mode = pmac_i2c_mode_std;
         if (bus->open && (rc = bus->open(bus)) != 0) {
                 bus->opened = 0;
-                up(&bus->sem);
+                mutex_unlock(&bus->mutex);
                 return rc;
         }
         return 0;
@@ -1112,7 +1113,7 @@ void pmac_i2c_close(struct pmac_i2c_bus *bus)
         if (bus->close)
                 bus->close(bus);
         bus->opened = 0;
-        up(&bus->sem);
+        mutex_unlock(&bus->mutex);
 }
 EXPORT_SYMBOL_GPL(pmac_i2c_close);
 
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index c4af9e21ac93..92586db19754 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -35,8 +35,6 @@
 #define DBG(x...)
 #endif
 
-static int add_bridge(struct device_node *dev);
-
 /* XXX Could be per-controller, but I don't think we risk anything by
  * assuming we won't have both UniNorth and Bandit */
 static int has_uninorth;
@@ -897,7 +895,7 @@ static void __init setup_u3_ht(struct pci_controller* hose)
  * "pci" (a MPC106) and no bandit or chaos bridges, and contrariwise,
  * if we have one or more bandit or chaos bridges, we don't have a MPC106.
  */
-static int __init add_bridge(struct device_node *dev)
+static int __init pmac_add_bridge(struct device_node *dev)
 {
         int len;
         struct pci_controller *hose;
@@ -918,15 +916,9 @@ static int __init add_bridge(struct device_node *dev)
                        " bus 0\n", dev->full_name);
         }
 
-        /* XXX Different prototypes, to be merged */
-#ifdef CONFIG_PPC64
         hose = pcibios_alloc_controller(dev);
-#else
-        hose = pcibios_alloc_controller();
-#endif
         if (!hose)
                 return -ENOMEM;
-        hose->arch_data = dev;
         hose->first_busno = bus_range ? bus_range[0] : 0;
         hose->last_busno = bus_range ? bus_range[1] : 0xff;
 
@@ -1006,19 +998,6 @@ void __devinit pmac_pci_irq_fixup(struct pci_dev *dev)
 #endif /* CONFIG_PPC32 */
 }
 
-#ifdef CONFIG_PPC64
-static void __init pmac_fixup_phb_resources(void)
-{
-        struct pci_controller *hose, *tmp;
-
-        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-                printk(KERN_INFO "PCI Host %d, io start: %lx; io end: %lx\n",
-                       hose->global_number,
-                       hose->io_resource.start, hose->io_resource.end);
-        }
-}
-#endif
-
 void __init pmac_pci_init(void)
 {
         struct device_node *np, *root;
@@ -1036,7 +1015,7 @@ void __init pmac_pci_init(void)
                 if (strcmp(np->name, "bandit") == 0
                     || strcmp(np->name, "chaos") == 0
                     || strcmp(np->name, "pci") == 0) {
-                        if (add_bridge(np) == 0)
+                        if (pmac_add_bridge(np) == 0)
                                 of_node_get(np);
                 }
                 if (strcmp(np->name, "ht") == 0) {
@@ -1050,28 +1029,9 @@ void __init pmac_pci_init(void)
         /* Probe HT last as it relies on the agp resources to be already
          * setup
          */
-        if (ht && add_bridge(ht) != 0)
+        if (ht && pmac_add_bridge(ht) != 0)
                 of_node_put(ht);
 
-        /*
-         * We need to call pci_setup_phb_io for the HT bridge first
-         * so it gets the I/O port numbers starting at 0, and we
-         * need to call it for the AGP bridge after that so it gets
-         * small positive I/O port numbers.
-         */
-        if (u3_ht)
-                pci_setup_phb_io(u3_ht, 1);
-        if (u3_agp)
-                pci_setup_phb_io(u3_agp, 0);
-        if (u4_pcie)
-                pci_setup_phb_io(u4_pcie, 0);
-
-        /*
-         * On ppc64, fixup the IO resources on our host bridges as
-         * the common code does it only for children of the host bridges
-         */
-        pmac_fixup_phb_resources();
-
         /* Setup the linkage between OF nodes and PHBs */
         pci_devs_phb_init();