Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Jun 2007 16:36:55 +0000 (09:36 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Jun 2007 16:36:55 +0000 (09:36 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix se73180 platform device registration.
  sh: ioremap() through PMB needs asm/mmu.h.
  sh: voyagergx: Fix build warnings.
  sh: Fix SH4-202 clock fwk set_rate() mismatch.
  sh: microdev: Fix compile warnings.
  sh: Fix in_nmi symbol build error.

arch/sh/boards/se/73180/setup.c
arch/sh/boards/superh/microdev/irq.c
arch/sh/cchips/voyagergx/irq.c
arch/sh/kernel/cpu/sh3/entry.S
arch/sh/kernel/cpu/sh4/clock-sh4-202.c
arch/sh/mm/ioremap.c
include/asm-sh/se73180.h

index 911ce1cdbd7f86865bb903ac054b359f0f6be82b..e143017c8975a0662ca64c2116106e8f97389533 100644 (file)
@@ -38,8 +38,8 @@ static struct platform_device *se73180_devices[] __initdata = {
 
 static int __init se73180_devices_setup(void)
 {
-       return platform_add_devices(sh7343se_platform_devices,
-                                   ARRAY_SIZE(sh7343se_platform_devices));
+       return platform_add_devices(se73180_devices,
+                                   ARRAY_SIZE(se73180_devices));
 }
 __initcall(se73180_devices_setup);
 
index cc1cb04fa61832975ebfde104dc24e1066b2b6ca..4d335077a3ffc8c590594f6065ece5573be91d31 100644 (file)
@@ -11,6 +11,7 @@
 
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/microdev.h>
index 70f12907647f13a32e73b3476c967dcb3cd0d237..d70e5c8461b56e4b60c72c43ae9204c4b0637a8e 100644 (file)
@@ -28,7 +28,7 @@ static void disable_voyagergx_irq(unsigned int irq)
        unsigned long val;
        unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE);
 
-       pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask);
+       pr_debug("disable_voyagergx_irq(%d): mask=%lx\n", irq, mask);
        val = readl((void __iomem *)VOYAGER_INT_MASK);
        val &= ~mask;
        writel(val, (void __iomem *)VOYAGER_INT_MASK);
@@ -39,7 +39,7 @@ static void enable_voyagergx_irq(unsigned int irq)
        unsigned long val;
        unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE);
 
-       pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask);
+       pr_debug("disable_voyagergx_irq(%d): mask=%lx\n", irq, mask);
        val = readl((void __iomem *)VOYAGER_INT_MASK);
        val |= mask;
        writel(val, (void __iomem *)VOYAGER_INT_MASK);
@@ -125,11 +125,12 @@ int voyagergx_irq_demux(int irq)
                        i = 17;
                else
                        printk("Unexpected IRQ irq = %d status = 0x%08lx\n", irq, val);
-               pr_debug("voyagergx_irq_demux %d \n", i);
-               if (i < VOYAGER_IRQ_NUM) {
+               pr_debug("voyagergx_irq_demux %ld \n", i);
+               if (i < VOYAGER_IRQ_NUM) {
                        irq = VOYAGER_IRQ_BASE + i;
-                       if (voyagergx_demux[i].func != 0)
-                               irq = voyagergx_demux[i].func(irq, voyagergx_demux[i].dev);
+                       if (voyagergx_demux[i].func != 0)
+                               irq = voyagergx_demux[i].func(irq,
+                                               voyagergx_demux[i].dev);
                }
        }
        return irq;
index 659cc081e5e701f5d155bf72e9cd297f93a42524..b0b59d4a33ca8ada675d624481d76b1708c9a4fc 100644 (file)
@@ -320,7 +320,9 @@ skip_restore:
 
        .align  2
 5:     .long   0x00001000      ! DSP
+#ifdef CONFIG_KGDB_NMI
 6:     .long   in_nmi
+#endif
 7:     .long   0x30000000
 
 ! common exception handler
index fcb2c41bc34e766c9a6650abdde04e6904846230..a33429463e96cd0c758b9f05f631a5d610025d6e 100644 (file)
@@ -111,7 +111,7 @@ static int shoc_clk_verify_rate(struct clk *clk, unsigned long rate)
        return 0;
 }
 
-static int shoc_clk_set_rate(struct clk *clk, unsigned long rate)
+static int shoc_clk_set_rate(struct clk *clk, unsigned long rate, int algo_id)
 {
        unsigned long frqcr3;
        unsigned int tmp;
index be03d74e99cbc4412c713ba96141b66a0443a21d..0c7b7e33abdcfd6e2ddf242623683d3ee89d7b6c 100644 (file)
@@ -22,6 +22,7 @@
 #include <asm/addrspace.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
+#include <asm/mmu.h>
 
 /*
  * Remap an arbitrary physical address space into the kernel virtual
index 3a4acb3e38a15239f695d0f95313977f5cb2f2bc..907c062b4c9a8296eebc5f77964d12296ed35acf 100644 (file)
@@ -1,9 +1,7 @@
-#ifndef __ASM_SH_HITACHI_SE73180_H
-#define __ASM_SH_HITACHI_SE73180_H
+#ifndef __ASM_SH_SE73180_H
+#define __ASM_SH_SE73180_H
 
 /*
- * include/asm-sh/se/se73180.h
- *
  * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
  *
  * SH-Mobile SolutionEngine 73180 support
@@ -62,4 +60,7 @@
 #define __IO_PREFIX    sh73180se
 #include <asm/io_generic.h>
 
-#endif  /* __ASM_SH_HITACHI_SE73180_H */
+/* arch/sh/boards/se/73180/irq.c */
+int shmse_irq_demux(int irq);
+
+#endif  /* __ASM_SH_SE73180_H */