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

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
  sh: sh7785lcr: Map whole PCI address space.
  sh: Fix up DSP context save/restore.
  sh: Fix up number of on-chip DMA channels on SH7091.
  sh: update defconfigs.
  sh: Kill off broken direct-mapped cache mode.
  sh: Wire up ARCH_HAS_DEFAULT_IDLE for cpuidle.
  sh: Add a command line option for disabling I/O trapping.
  sh: Select ARCH_HIBERNATION_POSSIBLE.
  sh: migor: Fix up CEU use flags.
  input: migor_ts: add wakeup support
  rtc: rtc-sh: use set_irq_wake()
  input: sh_keysc: use enable/disable_irq_wake()
  sh: intc: set_irq_wake() support
  sh: intc: install enable, disable and shutdown callbacks
  clocksource: sh_cmt: use remove_irq() and remove clockevent workaround
  sh: ap325 and Migo-R use new sh_mobile_ceu_info flags
  sh: Fix up -Wformat-security whining.
  sh: ap325rxa: Add ov772x support, again.
  sh: Sanitize asm/mmu.h for assembly use.
  sh: Tidy up sh7786 pinmux table.
  ...

9 files changed, 80 insertions, 237 deletions

diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S
index 55da0ff9848d..3cb531f233f2 100644
--- a/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@ -254,40 +254,6 @@ restore_all:
 
         lds     k2, pr                  ! restore pr
         !
-#ifdef CONFIG_SH_DSP
-        mov.l   @r15+, k0               ! DSP mode marker
-        mov.l   5f, k1
-        cmp/eq  k0, k1                  ! Do we have a DSP stack frame?
-        bf      skip_restore
-
-        stc     sr, k0                  ! Enable CPU DSP mode
-        or      k1, k0                  ! (within kernel it may be disabled)
-        ldc     k0, sr
-        mov     r2, k0                  ! Backup r2
-
-        ! Restore DSP registers from stack
-        mov     r15, r2
-        movs.l  @r2+, a1
-        movs.l  @r2+, a0g
-        movs.l  @r2+, a1g
-        movs.l  @r2+, m0
-        movs.l  @r2+, m1
-        mov     r2, r15
-
-        lds.l   @r15+, a0
-        lds.l   @r15+, x0
-        lds.l   @r15+, x1
-        lds.l   @r15+, y0
-        lds.l   @r15+, y1
-        lds.l   @r15+, dsr
-        ldc.l   @r15+, rs
-        ldc.l   @r15+, re
-        ldc.l   @r15+, mod
-
-        mov     k0, r2                  ! Restore r2
-skip_restore:
-#endif
-        !
         ! Calculate new SR value
         mov     k3, k2                  ! original SR value
         mov     #0xf0, k1
@@ -358,7 +324,7 @@ general_exception:
         add     k0, k4
 0:
         ! Setup stack and save DSP context (k0 contains original r15 on return)
-        bsr     prepare_stack_save_dsp
+        bsr     prepare_stack
          nop
 
         ! Save registers / Switch to bank 0
@@ -374,15 +340,14 @@ general_exception:
 1:      .long   EXPEVT
 #endif
 
-! prepare_stack_save_dsp()
+! prepare_stack()
 ! - roll back gRB
 ! - switch to kernel stack
-! - save DSP
 ! k0 returns original sp (after roll back)
 ! k1 trashed
 ! k2 trashed
 
-prepare_stack_save_dsp:
+prepare_stack:
 #ifdef CONFIG_GUSA
         ! Check for roll back gRB (User and Kernel)
         mov     r15, k0
@@ -416,47 +381,9 @@ prepare_stack_save_dsp:
         mov     k1, r15         ! change to kernel stack
         !
 1:
-#ifdef CONFIG_SH_DSP
-        ! Save DSP context if needed
-        stc     sr, k1
-        mov     #0x10, k2
-        shll8   k2                      ! DSP=1 (0x00001000)
-        tst     k2, k1                  ! Check if in DSP mode (passed in k2)
-        bt/s    skip_save
-         mov    #0, k1                  ! Set marker for no stack frame
-
-        mov     k2, k1                  ! Save has-frame marker
-
-        ! Save DSP registers on stack
-        stc.l   mod, @-r15
-        stc.l   re, @-r15
-        stc.l   rs, @-r15
-        sts.l   dsr, @-r15
-        sts.l   y1, @-r15
-        sts.l   y0, @-r15
-        sts.l   x1, @-r15
-        sts.l   x0, @-r15
-        sts.l   a0, @-r15
-
-        ! GAS is broken, does not generate correct "movs.l Ds,@-As" instr.
-
-        ! FIXME: Make sure that this is still the case with newer toolchains,
-        ! as we're not at all interested in supporting ancient toolchains at
-        ! this point. -- PFM.
-
-        mov     r15, k2
-        .word   0xf653                  ! movs.l        a1, @-r2
-        .word   0xf6f3                  ! movs.l        a0g, @-r2
-        .word   0xf6d3                  ! movs.l        a1g, @-r2
-        .word   0xf6c3                  ! movs.l        m0, @-r2
-        .word   0xf6e3                  ! movs.l        m1, @-r2
-        mov     k2, r15
-
-skip_save:
-        mov.l   k1, @-r15               ! Push DSP mode marker onto stack
-#endif
         rts
          nop
+
 !
 ! 0x400: Instruction and Data TLB miss exception vector
 !
@@ -468,7 +395,7 @@ handle_exception:
         mova    exception_data, k0
 
         ! Setup stack and save DSP context (k0 contains original r15 on return)
-        bsr     prepare_stack_save_dsp
+        bsr     prepare_stack
          PREF(k0)
 
         ! Save registers / Switch to bank 0
@@ -572,7 +499,7 @@ ENTRY(handle_interrupt)
         mova    exception_data, k0
 
         ! Setup stack and save DSP context (k0 contains original r15 on return)
-        bsr     prepare_stack_save_dsp
+        bsr     prepare_stack
          PREF(k0)
 
         ! Save registers / Switch to bank 0
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 3d3a3c4425a9..91e3677ae09d 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -199,11 +199,6 @@ int __init detect_cpu_and_cache_system(void)
                 break;
         }
 
-#ifdef CONFIG_SH_DIRECT_MAPPED
-        boot_cpu_data.icache.ways = 1;
-        boot_cpu_data.dcache.ways = 1;
-#endif
-
 #ifdef CONFIG_CPU_HAS_PTEA
         boot_cpu_data.flags |= CPU_HAS_PTEA;
 #endif
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
index 373b3447bfdf..4229e0724c89 100644
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
@@ -149,150 +149,44 @@ enum {
         PINMUX_FUNCTION_END,
 
         PINMUX_MARK_BEGIN,
-        CDE_MARK,
-        ETH_MAGIC_MARK,
-        DISP_MARK,
-        ETH_LINK_MARK,
-        DR5_MARK,
-        ETH_TX_ER_MARK,
-        DR4_MARK,
-        ETH_TX_EN_MARK,
-        DR3_MARK,
-        ETH_TXD3_MARK,
-        DR2_MARK,
-        ETH_TXD2_MARK,
-        DR1_MARK,
-        ETH_TXD1_MARK,
-        DR0_MARK,
-        ETH_TXD0_MARK,
-
-        VSYNC_MARK,
-        HSPI_CLK_MARK,
-        ODDF_MARK,
-        HSPI_CS_MARK,
-        DG5_MARK,
-        ETH_MDIO_MARK,
-        DG4_MARK,
-        ETH_RX_CLK_MARK,
-        DG3_MARK,
-        ETH_MDC_MARK,
-        DG2_MARK,
-        ETH_COL_MARK,
-        DG1_MARK,
-        ETH_TX_CLK_MARK,
-        DG0_MARK,
-        ETH_CRS_MARK,
-
-        DCLKIN_MARK,
-        HSPI_RX_MARK,
-        HSYNC_MARK,
-        HSPI_TX_MARK,
-        DB5_MARK,
-        ETH_RXD3_MARK,
-        DB4_MARK,
-        ETH_RXD2_MARK,
-        DB3_MARK,
-        ETH_RXD1_MARK,
-        DB2_MARK,
-        ETH_RXD0_MARK,
-        DB1_MARK,
-        ETH_RX_DV_MARK,
-        DB0_MARK,
-        ETH_RX_ER_MARK,
-
-        DCLKOUT_MARK,
-        SCIF1_SLK_MARK,
-        SCIF1_RXD_MARK,
-        SCIF1_TXD_MARK,
-        DACK1_MARK,
-        BACK_MARK,
-        FALE_MARK,
-        DACK0_MARK,
-        FCLE_MARK,
-        DREQ1_MARK,
-        BREQ_MARK,
-        USB_OVC1_MARK,
-        DREQ0_MARK,
-        USB_OVC0_MARK,
-
-        USB_PENC1_MARK,
-        USB_PENC0_MARK,
-
-        HAC1_SDOUT_MARK,
-        SSI1_SDATA_MARK,
-        SDIF1CMD_MARK,
-        HAC1_SDIN_MARK,
-        SSI1_SCK_MARK,
-        SDIF1CD_MARK,
-        HAC1_SYNC_MARK,
-        SSI1_WS_MARK,
-        SDIF1WP_MARK,
-        HAC1_BITCLK_MARK,
-        SSI1_CLK_MARK,
-        SDIF1CLK_MARK,
-        HAC0_SDOUT_MARK,
-        SSI0_SDATA_MARK,
-        SDIF1D3_MARK,
-        HAC0_SDIN_MARK,
-        SSI0_SCK_MARK,
-        SDIF1D2_MARK,
-        HAC0_SYNC_MARK,
-        SSI0_WS_MARK,
-        SDIF1D1_MARK,
-        HAC0_BITCLK_MARK,
-        SSI0_CLK_MARK,
-        SDIF1D0_MARK,
-
-        SCIF3_SCK_MARK,
-        SSI2_SDATA_MARK,
-        SCIF3_RXD_MARK,
-        TCLK_MARK,
-        SSI2_SCK_MARK,
-        SCIF3_TXD_MARK,
+        DCLKIN_MARK, DCLKOUT_MARK, ODDF_MARK,
+        VSYNC_MARK, HSYNC_MARK, CDE_MARK, DISP_MARK,
+        DR0_MARK, DR1_MARK, DR2_MARK, DR3_MARK, DR4_MARK, DR5_MARK,
+        DG0_MARK, DG1_MARK, DG2_MARK, DG3_MARK, DG4_MARK, DG5_MARK,
+        DB0_MARK, DB1_MARK, DB2_MARK, DB3_MARK, DB4_MARK, DB5_MARK,
+        ETH_MAGIC_MARK, ETH_LINK_MARK, ETH_TX_ER_MARK, ETH_TX_EN_MARK,
+        ETH_MDIO_MARK, ETH_RX_CLK_MARK, ETH_MDC_MARK, ETH_COL_MARK,
+        ETH_TX_CLK_MARK, ETH_CRS_MARK, ETH_RX_DV_MARK, ETH_RX_ER_MARK,
+        ETH_TXD3_MARK, ETH_TXD2_MARK, ETH_TXD1_MARK, ETH_TXD0_MARK,
+        ETH_RXD3_MARK, ETH_RXD2_MARK, ETH_RXD1_MARK, ETH_RXD0_MARK,
+        HSPI_CLK_MARK, HSPI_CS_MARK, HSPI_RX_MARK, HSPI_TX_MARK,
+        SCIF0_CTS_MARK, SCIF0_RTS_MARK,
+        SCIF0_SCK_MARK, SCIF0_RXD_MARK, SCIF0_TXD_MARK,
+        SCIF1_SCK_MARK, SCIF1_RXD_MARK, SCIF1_TXD_MARK,
+        SCIF3_SCK_MARK, SCIF3_RXD_MARK, SCIF3_TXD_MARK,
+        SCIF4_SCK_MARK, SCIF4_RXD_MARK, SCIF4_TXD_MARK,
+        SCIF5_SCK_MARK, SCIF5_RXD_MARK, SCIF5_TXD_MARK,
+        BREQ_MARK, IOIS16_MARK, CE2B_MARK, CE2A_MARK, BACK_MARK,
+        FALE_MARK, FRB_MARK, FSTATUS_MARK,
+        FSE_MARK, FCLE_MARK,
+        DACK0_MARK, DACK1_MARK, DACK2_MARK, DACK3_MARK,
+        DREQ0_MARK, DREQ1_MARK, DREQ2_MARK, DREQ3_MARK,
+        DRAK0_MARK, DRAK1_MARK, DRAK2_MARK, DRAK3_MARK,
+        USB_OVC1_MARK, USB_OVC0_MARK,
+        USB_PENC1_MARK, USB_PENC0_MARK,
         HAC_RES_MARK,
-        SSI2_WS_MARK,
-
-        DACK3_MARK,
-        SDIF0CMD_MARK,
-        DACK2_MARK,
-        SDIF0CD_MARK,
-        DREQ3_MARK,
-        SDIF0WP_MARK,
-        SCIF0_CTS_MARK,
-        DREQ2_MARK,
-        SDIF0CLK_MARK,
-        SCIF0_RTS_MARK,
-        IRL7_MARK,
-        SDIF0D3_MARK,
-        SCIF0_SCK_MARK,
-        IRL6_MARK,
-        SDIF0D2_MARK,
-        SCIF0_RXD_MARK,
-        IRL5_MARK,
-        SDIF0D1_MARK,
-        SCIF0_TXD_MARK,
-        IRL4_MARK,
-        SDIF0D0_MARK,
-
-        SCIF5_SCK_MARK,
-        FRB_MARK,
-        SCIF5_RXD_MARK,
-        IOIS16_MARK,
-        SCIF5_TXD_MARK,
-        CE2B_MARK,
-        DRAK3_MARK,
-        CE2A_MARK,
-        SCIF4_SCK_MARK,
-        DRAK2_MARK,
-        SSI3_WS_MARK,
-        SCIF4_RXD_MARK,
-        DRAK1_MARK,
-        SSI3_SDATA_MARK,
-        FSTATUS_MARK,
-        SCIF4_TXD_MARK,
-        DRAK0_MARK,
-        SSI3_SCK_MARK,
-        FSE_MARK,
+        HAC1_SDOUT_MARK, HAC1_SDIN_MARK, HAC1_SYNC_MARK, HAC1_BITCLK_MARK,
+        HAC0_SDOUT_MARK, HAC0_SDIN_MARK, HAC0_SYNC_MARK, HAC0_BITCLK_MARK,
+        SSI0_SDATA_MARK, SSI0_SCK_MARK, SSI0_WS_MARK, SSI0_CLK_MARK,
+        SSI1_SDATA_MARK, SSI1_SCK_MARK, SSI1_WS_MARK, SSI1_CLK_MARK,
+        SSI2_SDATA_MARK, SSI2_SCK_MARK, SSI2_WS_MARK,
+        SSI3_SDATA_MARK, SSI3_SCK_MARK, SSI3_WS_MARK,
+        SDIF1CMD_MARK, SDIF1CD_MARK, SDIF1WP_MARK, SDIF1CLK_MARK,
+        SDIF1D3_MARK, SDIF1D2_MARK, SDIF1D1_MARK, SDIF1D0_MARK,
+        SDIF0CMD_MARK, SDIF0CD_MARK, SDIF0WP_MARK, SDIF0CLK_MARK,
+        SDIF0D3_MARK, SDIF0D2_MARK, SDIF0D1_MARK, SDIF0D0_MARK,
+        TCLK_MARK,
+        IRL7_MARK, IRL6_MARK, IRL5_MARK, IRL4_MARK,
         PINMUX_MARK_END,
 };
 
@@ -377,7 +271,6 @@ static pinmux_enum_t pinmux_data[] = {
         PINMUX_DATA(PJ1_DATA, PJ1_IN, PJ1_OUT, PJ1_IN_PU),
 
         /* PA FN */
-        PINMUX_MARK_BEGIN,
         PINMUX_DATA(CDE_MARK,           P1MSEL2_0, PA7_FN),
         PINMUX_DATA(DISP_MARK,          P1MSEL2_0, PA6_FN),
         PINMUX_DATA(DR5_MARK,           P1MSEL2_0, PA5_FN),
@@ -434,7 +327,7 @@ static pinmux_enum_t pinmux_data[] = {
 
         /* PD FN */
         PINMUX_DATA(DCLKOUT_MARK,       PD7_FN),
-        PINMUX_DATA(SCIF1_SLK_MARK,     PD6_FN),
+        PINMUX_DATA(SCIF1_SCK_MARK,     PD6_FN),
         PINMUX_DATA(SCIF1_RXD_MARK,     PD5_FN),
         PINMUX_DATA(SCIF1_TXD_MARK,     PD4_FN),
         PINMUX_DATA(DACK1_MARK,         P1MSEL13_1, P1MSEL12_0, PD3_FN),
@@ -662,7 +555,7 @@ static struct pinmux_gpio pinmux_gpios[] = {
         PINMUX_GPIO(GPIO_FN_DB0,                DB0_MARK),
         PINMUX_GPIO(GPIO_FN_ETH_RX_ER,          ETH_RX_ER_MARK),
         PINMUX_GPIO(GPIO_FN_DCLKOUT,            DCLKOUT_MARK),
-        PINMUX_GPIO(GPIO_FN_SCIF1_SLK,          SCIF1_SLK_MARK),
+        PINMUX_GPIO(GPIO_FN_SCIF1_SCK,          SCIF1_SCK_MARK),
         PINMUX_GPIO(GPIO_FN_SCIF1_RXD,          SCIF1_RXD_MARK),
         PINMUX_GPIO(GPIO_FN_SCIF1_TXD,          SCIF1_TXD_MARK),
         PINMUX_GPIO(GPIO_FN_DACK1,              DACK1_MARK),
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c
index fe59ccfc1152..f35ed0348850 100644
--- a/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
@@ -38,7 +38,7 @@ static int __init hlt_setup(char *__unused)
 }
 __setup("hlt", hlt_setup);
 
-static void default_idle(void)
+void default_idle(void)
 {
         if (!hlt_counter) {
                 clear_thread_flag(TIF_POLLING_NRFLAG);
diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index 39cd7f3aec7b..c22853b059ef 100644
--- a/arch/sh/kernel/io_trapped.c
+++ b/arch/sh/kernel/io_trapped.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
+#include <linux/init.h>
 #include <asm/system.h>
 #include <asm/mmu_context.h>
 #include <asm/uaccess.h>
@@ -32,6 +33,15 @@ EXPORT_SYMBOL_GPL(trapped_mem);
 #endif
 static DEFINE_SPINLOCK(trapped_lock);
 
+static int trapped_io_disable __read_mostly;
+
+static int __init trapped_io_setup(char *__unused)
+{
+        trapped_io_disable = 1;
+        return 1;
+}
+__setup("noiotrap", trapped_io_setup);
+
 int register_trapped_io(struct trapped_io *tiop)
 {
         struct resource *res;
@@ -39,6 +49,9 @@ int register_trapped_io(struct trapped_io *tiop)
         struct page *pages[TRAPPED_PAGES_MAX];
         int k, n;
 
+        if (unlikely(trapped_io_disable))
+                return 0;
+
         /* structure must be page aligned */
         if ((unsigned long)tiop & (PAGE_SIZE - 1))
                 goto bad;
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index 694bc15f84fd..6d94725d22f2 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -176,14 +176,26 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 {
         struct thread_info *ti = task_thread_info(p);
         struct pt_regs *childregs;
-#if defined(CONFIG_SH_FPU)
+#if defined(CONFIG_SH_FPU) || defined(CONFIG_SH_DSP)
         struct task_struct *tsk = current;
+#endif
 
+#if defined(CONFIG_SH_FPU)
         unlazy_fpu(tsk, regs);
         p->thread.fpu = tsk->thread.fpu;
         copy_to_stopped_child_used_math(p);
 #endif
 
+#if defined(CONFIG_SH_DSP)
+        if (is_dsp_enabled(tsk)) {
+                /* We can use the __save_dsp or just copy the struct:
+                 * __save_dsp(p);
+                 * p->thread.dsp_status.status |= SR_DSP
+                 */
+                p->thread.dsp_status = tsk->thread.dsp_status;
+        }
+#endif
+
         childregs = task_pt_regs(p);
         *childregs = *regs;
 
diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index 29ca09d24ef8..f7b22dd83b0c 100644
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -200,7 +200,8 @@ static int dspregs_get(struct task_struct *target,
                        unsigned int pos, unsigned int count,
                        void *kbuf, void __user *ubuf)
 {
-        const struct pt_dspregs *regs = task_pt_dspregs(target);
+        const struct pt_dspregs *regs =
+                (struct pt_dspregs *)&target->thread.dsp_status.dsp_regs;
         int ret;
 
         ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, regs,
@@ -217,7 +218,8 @@ static int dspregs_set(struct task_struct *target,
                        unsigned int pos, unsigned int count,
                        const void *kbuf, const void __user *ubuf)
 {
-        struct pt_dspregs *regs = task_pt_dspregs(target);
+        struct pt_dspregs *regs =
+                (struct pt_dspregs *)&target->thread.dsp_status.dsp_regs;
         int ret;
 
         ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, regs,
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 24c60251f680..04a6004fccc4 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -103,12 +103,11 @@ static int __init early_parse_mem(char *p)
         size = memparse(p, &p);
 
         if (size > __MEMORY_SIZE) {
-                static char msg[] __initdata = KERN_ERR
+                printk(KERN_ERR
                         "Using mem= to increase the size of kernel memory "
                         "is not allowed.\n"
                         "  Recompile the kernel with the correct value for "
-                        "CONFIG_MEMORY_SIZE.\n";
-                printk(msg);
+                        "CONFIG_MEMORY_SIZE.\n");
                 return 0;
         }
 
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index 60dcf87ed019..30ca9c51e52d 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -664,6 +664,8 @@ asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
         if (is_dsp_inst(regs)) {
                 /* Enable DSP mode, and restart instruction. */
                 regs->sr |= SR_DSP;
+                /* Save DSP mode */
+                tsk->thread.dsp_status.status |= SR_DSP;
                 return;
         }
 #endif