Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a2e2103 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 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.
parents 7244d545 9a412847

arch/sh/boards/se/73180/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

arch/sh/boards/superh/microdev/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/sh/cchips/voyagergx/irq.c

+7 −6
Original line number Diff line number Diff line
@@ -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);

		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);

				irq = voyagergx_demux[i].func(irq,

						voyagergx_demux[i].dev);

		}

	}

	return irq;

arch/sh/kernel/cpu/sh3/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/sh/kernel/cpu/sh4/clock-sh4-202.c

+1 −1
Original line number Diff line number Diff line
@@ -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;