Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
  [POWERPC] re-enable OProfile for iSeries, using timer interrupt
  [POWERPC] support ibm,extended-*-frequency properties
  [POWERPC] Extra sanity check in EEH code
  [POWERPC] Dont look for class-code in pci children
  [POWERPC] Fix mdelay badness on shared processor partitions
  [POWERPC] disable floating point exceptions for init
  [POWERPC] Unify ppc syscall tables
  [POWERPC] mpic: add support for serial mode interrupts
  [POWERPC] pseries: Print PCI slot location code on failure
  [POWERPC] spufs: one more fix for 64k pages
  [POWERPC] spufs: fail spu_create with invalid flags
  [POWERPC] spufs: clear class2 interrupt status before wakeup
  [POWERPC] spufs: fix Makefile for "make clean"
  [POWERPC] spufs: remove stop_code from struct spu
  [POWERPC] spufs: fix spu irq affinity setting
  [POWERPC] spufs: further abstract priv1 register access
  [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
  [POWERPC] spufs: dont try to access SPE channel 1 count
  [POWERPC] spufs: use kzalloc in create_spu
  [POWERPC] spufs: fix initial state of wbox file
  ...

Manually resolved conflicts in:
	drivers/net/phy/Makefile
	include/asm-powerpc/spu.h

1 files changed, 33 insertions, 34 deletions

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 24e3ad756de0..d20907561f46 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -76,7 +76,6 @@
 
 /* keep track of when we need to update the rtc */
 time_t last_rtc_update;
-extern int piranha_simulator;
 #ifdef CONFIG_PPC_ISERIES
 unsigned long iSeries_recal_titan = 0;
 unsigned long iSeries_recal_tb = 0; 
@@ -858,42 +857,50 @@ int do_settimeofday(struct timespec *tv)
 
 EXPORT_SYMBOL(do_settimeofday);
 
-void __init generic_calibrate_decr(void)
+static int __init get_freq(char *name, int cells, unsigned long *val)
 {
         struct device_node *cpu;
         unsigned int *fp;
-        int node_found;
+        int found = 0;
 
-        /*
-         * The cpu node should have a timebase-frequency property
-         * to tell us the rate at which the decrementer counts.
-         */
+        /* The cpu node should have timebase and clock frequency properties */
         cpu = of_find_node_by_type(NULL, "cpu");
 
-        ppc_tb_freq = DEFAULT_TB_FREQ;          /* hardcoded default */
-        node_found = 0;
         if (cpu) {
-                fp = (unsigned int *)get_property(cpu, "timebase-frequency",
-                                                  NULL);
+                fp = (unsigned int *)get_property(cpu, name, NULL);
                 if (fp) {
-                        node_found = 1;
-                        ppc_tb_freq = *fp;
+                        found = 1;
+                        *val = 0;
+                        while (cells--)
+                                *val = (*val << 32) | *fp++;
                 }
+
+                of_node_put(cpu);
         }
-        if (!node_found)
+
+        return found;
+}
+
+void __init generic_calibrate_decr(void)
+{
+        ppc_tb_freq = DEFAULT_TB_FREQ;          /* hardcoded default */
+
+        if (!get_freq("ibm,extended-timebase-frequency", 2, &ppc_tb_freq) &&
+            !get_freq("timebase-frequency", 1, &ppc_tb_freq)) {
+
                 printk(KERN_ERR "WARNING: Estimating decrementer frequency "
                                 "(not found)\n");
+        }
 
-        ppc_proc_freq = DEFAULT_PROC_FREQ;
-        node_found = 0;
-        if (cpu) {
-                fp = (unsigned int *)get_property(cpu, "clock-frequency",
-                                                  NULL);
-                if (fp) {
-                        node_found = 1;
-                        ppc_proc_freq = *fp;
-                }
+        ppc_proc_freq = DEFAULT_PROC_FREQ;      /* hardcoded default */
+
+        if (!get_freq("ibm,extended-clock-frequency", 2, &ppc_proc_freq) &&
+            !get_freq("clock-frequency", 1, &ppc_proc_freq)) {
+
+                printk(KERN_ERR "WARNING: Estimating processor frequency "
+                                "(not found)\n");
         }
+
 #ifdef CONFIG_BOOKE
         /* Set the time base to zero */
         mtspr(SPRN_TBWL, 0);
@@ -905,11 +912,6 @@ void __init generic_calibrate_decr(void)
         /* Enable decrementer interrupt */
         mtspr(SPRN_TCR, TCR_DIE);
 #endif
-        if (!node_found)
-                printk(KERN_ERR "WARNING: Estimating processor frequency "
-                                "(not found)\n");
-
-        of_node_put(cpu);
 }
 
 unsigned long get_boot_time(void)
@@ -945,9 +947,9 @@ void __init time_init(void)
         } else {
                 /* Normal PowerPC with timebase register */
                 ppc_md.calibrate_decr();
-                printk(KERN_INFO "time_init: decrementer frequency = %lu.%.6lu MHz\n",
+                printk(KERN_DEBUG "time_init: decrementer frequency = %lu.%.6lu MHz\n",
                        ppc_tb_freq / 1000000, ppc_tb_freq % 1000000);
-                printk(KERN_INFO "time_init: processor frequency   = %lu.%.6lu MHz\n",
+                printk(KERN_DEBUG "time_init: processor frequency   = %lu.%.6lu MHz\n",
                        ppc_proc_freq / 1000000, ppc_proc_freq % 1000000);
                 tb_last_stamp = tb_last_jiffy = get_tb();
         }
@@ -1010,10 +1012,7 @@ void __init time_init(void)
         tb_to_ns_scale = scale;
         tb_to_ns_shift = shift;
 
-#ifdef CONFIG_PPC_ISERIES
-        if (!piranha_simulator)
-#endif
-                tm = get_boot_time();
+        tm = get_boot_time();
 
         write_seqlock_irqsave(&xtime_lock, flags);