Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (32 commits)
  [POWERPC] Remove build warnings in windfarm_core
  [POWERPC] Pass per-file CFLAGs for platform specific op codes
  [POWERPC] Correct #endif comment
  [POWERPC] Fix ppc_rtas_progress_show()
  [POWERPC] Fix sed command lines for zlib source construction
  [POWERPC] Specify GNUTARGET on $(AR) invocations
  [POWERPC] Make sure device node type/name is not NULL on hot-added nodes
  [POWERPC] Small fixes for the Ebony device tree
  [POWERPC] Fix warning on UP
  [POWERPC] cell_defconfig: Disable cpufreq and pmi
  [POWERPC] Fix IO space on PCI buses created from of_platform
  [POWERPC] Add spinlock to request_phb_iospace()
  [POWERPC] Fix make rules for treeImage.initrd
  [POWERPC] Remove warning in mpic.c
  [POWERPC] Update pasemi_defconfig
  [POWERPC] pasemi: CONFIG_GENERIC_TBSYNC no longer needed
  [POWERPC] Update iseries_defconfig
  [POWERPC] Wire up some more syscalls
  [POWERPC] Fix bug adding properties with flatdevtree.c's ft_set_prop()
  [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error
  ...

5 files changed, 18 insertions, 17 deletions

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 8e66949e7c67..1b3e008fd148 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -38,7 +38,8 @@ config 440EP
 
 config 440GP
         bool
-        select IBM_NEW_EMAC_ZMII
+# Disabled until the new EMAC Driver is merged.
+#       select IBM_NEW_EMAC_ZMII
 
 config 440GX
         bool
diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index ad526eafc90b..5a7fec8d10d3 100644
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -27,9 +27,9 @@
 #include "44x.h"
 
 static struct of_device_id ebony_of_bus[] = {
-        { .type = "ibm,plb", },
-        { .type = "ibm,opb", },
-        { .type = "ibm,ebc", },
+        { .compatible = "ibm,plb4", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 354b8dd2a2c1..6a0060a5f2ec 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -37,6 +37,7 @@
 #include <linux/wait.h>
 #include <linux/seq_file.h>
 #include <linux/interrupt.h>
+#include <linux/completion.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -81,7 +82,7 @@ static void handleMonitorEvent(struct HvLpEvent *event);
  * if system_state is not SYSTEM_RUNNING, then wait_atomic is used ...
  */
 struct alloc_parms {
-        struct semaphore sem;
+        struct completion done;
         int number;
         atomic_t wait_atomic;
         int used_wait_atomic;
@@ -115,7 +116,7 @@ static int proc_viopath_show(struct seq_file *m, void *v)
         u16 vlanMap;
         dma_addr_t handle;
         HvLpEvent_Rc hvrc;
-        DECLARE_MUTEX_LOCKED(Semaphore);
+        DECLARE_COMPLETION(done);
         struct device_node *node;
         const char *sysid;
 
@@ -132,13 +133,13 @@ static int proc_viopath_show(struct seq_file *m, void *v)
                         HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,
                         viopath_sourceinst(viopath_hostLp),
                         viopath_targetinst(viopath_hostLp),
-                        (u64)(unsigned long)&Semaphore, VIOVERSION << 16,
+                        (u64)(unsigned long)&done, VIOVERSION << 16,
                         ((u64)handle) << 32, HW_PAGE_SIZE, 0, 0);
 
         if (hvrc != HvLpEvent_Rc_Good)
                 printk(VIOPATH_KERN_WARN "hv error on op %d\n", (int)hvrc);
 
-        down(&Semaphore);
+        wait_for_completion(&done);
 
         vlanMap = HvLpConfig_getVirtualLanIndexMap();
 
@@ -353,7 +354,7 @@ static void handleConfig(struct HvLpEvent *event)
                 return;
         }
 
-        up((struct semaphore *)event->xCorrelationToken);
+        complete((struct completion *)event->xCorrelationToken);
 }
 
 /*
@@ -464,7 +465,7 @@ static void viopath_donealloc(void *parm, int number)
         if (parmsp->used_wait_atomic)
                 atomic_set(&parmsp->wait_atomic, 0);
         else
-                up(&parmsp->sem);
+                complete(&parmsp->done);
 }
 
 static int allocateEvents(HvLpIndex remoteLp, int numEvents)
@@ -476,7 +477,7 @@ static int allocateEvents(HvLpIndex remoteLp, int numEvents)
                 atomic_set(&parms.wait_atomic, 1);
         } else {
                 parms.used_wait_atomic = 0;
-                init_MUTEX_LOCKED(&parms.sem);
+                init_completion(&parms.done);
         }
         mf_allocate_lp_events(remoteLp, HvLpEvent_Type_VirtualIo, 250,  /* It would be nice to put a real number here! */
                             numEvents, &viopath_donealloc, &parms);
@@ -484,7 +485,7 @@ static int allocateEvents(HvLpIndex remoteLp, int numEvents)
                 while (atomic_read(&parms.wait_atomic))
                         mb();
         } else
-                down(&parms.sem);
+                wait_for_completion(&parms.done);
         return parms.number;
 }
 
@@ -585,10 +586,10 @@ int viopath_close(HvLpIndex remoteLp, int subtype, int numReq)
         spin_unlock_irqrestore(&statuslock, flags);
 
         parms.used_wait_atomic = 0;
-        init_MUTEX_LOCKED(&parms.sem);
+        init_completion(&parms.done);
         mf_deallocate_lp_events(remoteLp, HvLpEvent_Type_VirtualIo,
                               numReq, &viopath_donealloc, &parms);
-        down(&parms.sem);
+        wait_for_completion(&parms.done);
 
         spin_lock_irqsave(&statuslock, flags);
         for (i = 0, numOpen = 0; i < VIO_MAX_SUBTYPES; i++)
diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig
index eb4dbc705b06..7c5076e38ea1 100644
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/arch/powerpc/platforms/pasemi/Kconfig
@@ -4,7 +4,6 @@ config PPC_PASEMI
         default n
         select MPIC
         select PPC_UDBG_16550
-        select GENERIC_TBSYNC
         select PPC_NATIVE
         help
           This option enables support for PA Semi's PWRficient line
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index 22bc01989749..2729d559fd91 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -21,8 +21,8 @@ extern int pSeries_machine_check_exception(struct pt_regs *regs);
 extern void smp_init_pseries_mpic(void);
 extern void smp_init_pseries_xics(void);
 #else
-static inline smp_init_pseries_mpic(void) { };
-static inline smp_init_pseries_xics(void) { };
+static inline void smp_init_pseries_mpic(void) { };
+static inline void smp_init_pseries_xics(void) { };
 #endif
 
 #ifdef CONFIG_KEXEC