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: Make intc messages consistent via pr_fmt.
  sh: make sure static declaration on ms7724se
  sh: make sure static declaration on mach-migor
  sh: make sure static declaration on mach-ecovec24
  sh: make sure static declaration on mach-ap325rxa
  clocksource: sh_cmt: compute mult and shift before registration
  clocksource: sh_tmu: compute mult and shift before registration
  sh: PIO disabling for x3proto and urquell.
  sh: mach-sdk7786: conditionally disable PIO support.
  sh: support for platforms without PIO.
  usb: r8a66597-hcd pio to mmio accessor conversion.
  usb: gadget: r8a66597-udc pio to mmio accessor conversion.
  usb: gadget: m66592-udc pio to mmio accessor conversion.
  sh: add romImage MMCIF boot for sh7724 and Ecovec V2
  sh: add boot code to MMCIF driver header
  sh: prepare MMCIF driver header file
  sh: allow romImage data between head.S and the zero page
  sh: Add support MMCIF for ecovec
  sh: remove duplicated #include
  input: serio: disable i8042 for non-cayman sh platforms.
  ...

4 files changed, 122 insertions, 7 deletions

diff --git a/arch/sh/boot/romimage/Makefile b/arch/sh/boot/romimage/Makefile
index f473a24a2d92..2216ee57f251 100644
--- a/arch/sh/boot/romimage/Makefile
+++ b/arch/sh/boot/romimage/Makefile
@@ -1,16 +1,21 @@
 #
 # linux/arch/sh/boot/romimage/Makefile
 #
-# create an image suitable for burning to flash from zImage
+# create an romImage file suitable for burning to flash/mmc from zImage
 #
 
 targets         := vmlinux head.o zeropage.bin piggy.o
+load-y          := 0
 
-OBJECTS = $(obj)/head.o
-LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext 0 -e romstart \
+mmcif-load-$(CONFIG_CPU_SUBTYPE_SH7724) := 0xe5200000 # ILRAM
+mmcif-obj-$(CONFIG_CPU_SUBTYPE_SH7724)  := $(obj)/mmcif-sh7724.o
+load-$(CONFIG_ROMIMAGE_MMCIF)           := $(mmcif-load-y)
+obj-$(CONFIG_ROMIMAGE_MMCIF)            := $(mmcif-obj-y)
+
+LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(load-y) -e romstart \
                    -T $(obj)/../../kernel/vmlinux.lds
 
-$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(obj)/head.o $(obj-y) $(obj)/piggy.o FORCE
         $(call if_changed,ld)
         @:
 
diff --git a/arch/sh/boot/romimage/head.S b/arch/sh/boot/romimage/head.S
index 93e779a405ec..4671d1b82150 100644
--- a/arch/sh/boot/romimage/head.S
+++ b/arch/sh/boot/romimage/head.S
@@ -12,8 +12,40 @@ romstart:
         /* include board specific setup code */
 #include <mach/romimage.h>
 
+#ifdef CONFIG_ROMIMAGE_MMCIF
+        /* load the romImage to above the empty zero page */
+        mov.l   empty_zero_page_dst, r4
+        mov.l   empty_zero_page_dst_adj, r5
+        add     r5, r4
+        mov.l   bytes_to_load, r5
+        mov.l   loader_function, r7
+        jsr     @r7
+         mov    r4, r15
+
+        mov.l   empty_zero_page_dst, r4
+        mov.l   empty_zero_page_dst_adj, r5
+        add     r5, r4
+        mov.l   loaded_code_offs, r5
+        add     r5, r4
+        jmp     @r4
+         nop
+
+        .balign 4
+empty_zero_page_dst_adj:
+        .long   PAGE_SIZE
+bytes_to_load:
+        .long   end_data - romstart
+loader_function:
+        .long   mmcif_loader
+loaded_code_offs:
+        .long   loaded_code - romstart
+loaded_code:
+#endif /* CONFIG_ROMIMAGE_MMCIF */
+
         /* copy the empty_zero_page contents to where vmlinux expects it */
-        mova    empty_zero_page_src, r0
+        mova    extra_data_pos, r0
+        mov.l   extra_data_size, r1
+        add     r1, r0
         mov.l   empty_zero_page_dst, r1
         mov     #(PAGE_SHIFT - 4), r4
         mov     #1, r3
@@ -37,7 +69,9 @@ romstart:
         mov     #PAGE_SHIFT, r4
         mov     #1, r1
         shld    r4, r1
-        mova    empty_zero_page_src, r0
+        mova    extra_data_pos, r0
+        add     r1, r0
+        mov.l   extra_data_size, r1
         add     r1, r0
         jmp     @r0
          nop
@@ -45,4 +79,6 @@ romstart:
         .align 2
 empty_zero_page_dst:
         .long   _text
-empty_zero_page_src:
+extra_data_pos:
+extra_data_size:
+        .long   zero_page_pos - extra_data_pos
diff --git a/arch/sh/boot/romimage/mmcif-sh7724.c b/arch/sh/boot/romimage/mmcif-sh7724.c
new file mode 100644
index 000000000000..14863d7292cb
--- /dev/null
+++ b/arch/sh/boot/romimage/mmcif-sh7724.c
@@ -0,0 +1,72 @@
+/*
+ * sh7724 MMCIF loader
+ *
+ * Copyright (C) 2010 Magnus Damm
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/mmc/sh_mmcif.h>
+#include <mach/romimage.h>
+
+#define MMCIF_BASE      (void __iomem *)0xa4ca0000
+
+#define MSTPCR2         0xa4150038
+#define PTWCR           0xa4050146
+#define PTXCR           0xa4050148
+#define PSELA           0xa405014e
+#define PSELE           0xa4050156
+#define HIZCRC          0xa405015c
+#define DRVCRA          0xa405018a
+
+enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT,
+       MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE };
+
+/* SH7724 specific MMCIF loader
+ *
+ * loads the romImage from an MMC card starting from block 512
+ * use the following line to write the romImage to an MMC card
+ * # dd if=arch/sh/boot/romImage of=/dev/sdx bs=512 seek=512
+ */
+asmlinkage void mmcif_loader(unsigned char *buf, unsigned long no_bytes)
+{
+        mmcif_update_progress(MMCIF_PROGRESS_ENTER);
+
+        /* enable clock to the MMCIF hardware block */
+        __raw_writel(__raw_readl(MSTPCR2) & ~0x20000000, MSTPCR2);
+
+        /* setup pins D7-D0 */
+        __raw_writew(0x0000, PTWCR);
+
+        /* setup pins MMC_CLK, MMC_CMD */
+        __raw_writew(__raw_readw(PTXCR) & ~0x000f, PTXCR);
+
+        /* select D3-D0 pin function */
+        __raw_writew(__raw_readw(PSELA) & ~0x2000, PSELA);
+
+        /* select D7-D4 pin function */
+        __raw_writew(__raw_readw(PSELE) & ~0x3000, PSELE);
+
+        /* disable Hi-Z for the MMC pins */
+        __raw_writew(__raw_readw(HIZCRC) & ~0x0620, HIZCRC);
+
+        /* high drive capability for MMC pins */
+        __raw_writew(__raw_readw(DRVCRA) | 0x3000, DRVCRA);
+
+        mmcif_update_progress(MMCIF_PROGRESS_INIT);
+
+        /* setup MMCIF hardware */
+        sh_mmcif_boot_init(MMCIF_BASE);
+
+        mmcif_update_progress(MMCIF_PROGRESS_LOAD);
+
+        /* load kernel via MMCIF interface */
+        sh_mmcif_boot_slurp(MMCIF_BASE, buf, no_bytes);
+
+        /* disable clock to the MMCIF hardware block */
+        __raw_writel(__raw_readl(MSTPCR2) | 0x20000000, MSTPCR2);
+
+        mmcif_update_progress(MMCIF_PROGRESS_DONE);
+}
diff --git a/arch/sh/boot/romimage/vmlinux.scr b/arch/sh/boot/romimage/vmlinux.scr
index 287c08f8b4bb..590394e2f5f2 100644
--- a/arch/sh/boot/romimage/vmlinux.scr
+++ b/arch/sh/boot/romimage/vmlinux.scr
@@ -1,6 +1,8 @@
 SECTIONS
 {
   .text : {
+        zero_page_pos = .;
         *(.data)
+        end_data = .;
         }
 }