Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (28 commits)
  sparc32: fix build, fix missing cpu_relax declaration
  SCHED_TTWU_QUEUE is not longer needed since sparc32 now implements IPI
  sparc32,leon: Remove unnecessary page_address calls in LEON DMA API.
  sparc: convert old cpumask API into new one
  sparc32, sun4d: Implemented SMP IPIs support for SUN4D machines
  sparc32, sun4m: Implemented SMP IPIs support for SUN4M machines
  sparc32,leon: Implemented SMP IPIs for LEON CPU
  sparc32: implement SMP IPIs using the generic functions
  sparc32,leon: SMP power down implementation
  sparc32,leon: added some SMP comments
  sparc: add {read,write}*_be routines
  sparc32,leon: don't rely on bootloader to mask IRQs
  sparc32,leon: operate on boot-cpu IRQ controller registers
  sparc32: always define boot_cpu_id
  sparc32: removed unused code, implemented by generic code
  sparc32: avoid build warning at mm/percpu.c:1647
  sparc32: always register a PROM based early console
  sparc32: probe for cpu info only during startup
  sparc: consolidate show_cpuinfo in cpu.c
  sparc32,leon: implement genirq CPU affinity
  ...

1 files changed, 29 insertions, 11 deletions

diff --git a/arch/sparc/include/asm/floppy_32.h b/arch/sparc/include/asm/floppy_32.h
index 86666f70322e..482c79e2a416 100644
--- a/arch/sparc/include/asm/floppy_32.h
+++ b/arch/sparc/include/asm/floppy_32.h
@@ -281,28 +281,27 @@ static inline void sun_fd_enable_dma(void)
         pdma_areasize = pdma_size;
 }
 
-/* Our low-level entry point in arch/sparc/kernel/entry.S */
-extern int sparc_floppy_request_irq(int irq, unsigned long flags,
-                                    irq_handler_t irq_handler);
+extern int sparc_floppy_request_irq(unsigned int irq,
+                                    irq_handler_t irq_handler);
 
 static int sun_fd_request_irq(void)
 {
         static int once = 0;
-        int error;
 
-        if(!once) {
+        if (!once) {
                 once = 1;
-                error = sparc_floppy_request_irq(FLOPPY_IRQ,
-                                                 IRQF_DISABLED,
-                                                 floppy_interrupt);
-                return ((error == 0) ? 0 : -1);
-        } else return 0;
+                return sparc_floppy_request_irq(FLOPPY_IRQ, floppy_interrupt);
+        } else {
+                return 0;
+        }
 }
 
 static struct linux_prom_registers fd_regs[2];
 
 static int sun_floppy_init(void)
 {
+        struct platform_device *op;
+        struct device_node *dp;
         char state[128];
         phandle tnode, fd_node;
         int num_regs;
@@ -310,7 +309,6 @@ static int sun_floppy_init(void)
 
         use_virtual_dma = 1;
 
-        FLOPPY_IRQ = 11;
         /* Forget it if we aren't on a machine that could possibly
          * ever have a floppy drive.
          */
@@ -349,6 +347,26 @@ static int sun_floppy_init(void)
         sun_fdc = (struct sun_flpy_controller *)
             of_ioremap(&r, 0, fd_regs[0].reg_size, "floppy");
 
+        /* Look up irq in platform_device.
+         * We try "SUNW,fdtwo" and "fd"
+         */
+        for_each_node_by_name(dp, "SUNW,fdtwo") {
+                op = of_find_device_by_node(dp);
+                if (op)
+                        break;
+        }
+        if (!op) {
+                for_each_node_by_name(dp, "fd") {
+                        op = of_find_device_by_node(dp);
+                        if (op)
+                                break;
+                }
+        }
+        if (!op)
+                goto no_sun_fdc;
+
+        FLOPPY_IRQ = op->archdata.irqs[0];
+
         /* Last minute sanity check... */
         if(sun_fdc->status_82072 == 0xff) {
                 sun_fdc = NULL;