Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
  [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
  [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
  [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
  [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
  imxfb: Fix TFT mode
  i.MX21/27: remove ifdef CONFIG_FB_IMX
  imxfb: add clock support
  mxc: add arch_reset() function
  clkdev: add possibility to get a clock based on the device name
  i.MX1: remove fb support from mach-imx
  [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
  Gemini: Add support for Teltonika RUT100
  Gemini: gpiolib based GPIO support v2
  MAINTAINERS: add myself as Gemini architecture maintainer
  ARM: Add Gemini architecture v3
  [ARM] OMAP: Fix compile for omap2_init_common_hw()
  MAINTAINERS: Add myself as Faraday ARM core variant maintainer
  ARM: Add support for FA526 v2
  [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
  [ARM] collie: fix two minor formatting nits
  ...

1 files changed, 82 insertions, 0 deletions

diff --git a/arch/arm/mach-gemini/mm.c b/arch/arm/mach-gemini/mm.c
new file mode 100644
index 000000000000..51948242ec09
--- /dev/null
+++ b/arch/arm/mach-gemini/mm.c
@@ -0,0 +1,82 @@
+/*
+ *  Static mappings for Gemini
+ *
+ *  Copyright (C) 2001-2006 Storlink, Corp.
+ *  Copyright (C) 2008-2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#include <linux/mm.h>
+#include <linux/init.h>
+
+#include <asm/mach/map.h>
+
+#include <mach/hardware.h>
+
+/* Page table mapping for I/O region */
+static struct map_desc gemini_io_desc[] __initdata = {
+        {
+                .virtual        = IO_ADDRESS(GEMINI_GLOBAL_BASE),
+                .pfn            =__phys_to_pfn(GEMINI_GLOBAL_BASE),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = IO_ADDRESS(GEMINI_UART_BASE),
+                .pfn            = __phys_to_pfn(GEMINI_UART_BASE),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = IO_ADDRESS(GEMINI_TIMER_BASE),
+                .pfn            = __phys_to_pfn(GEMINI_TIMER_BASE),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = IO_ADDRESS(GEMINI_INTERRUPT_BASE),
+                .pfn            = __phys_to_pfn(GEMINI_INTERRUPT_BASE),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = IO_ADDRESS(GEMINI_POWER_CTRL_BASE),
+                .pfn            = __phys_to_pfn(GEMINI_POWER_CTRL_BASE),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = IO_ADDRESS(GEMINI_GPIO_BASE(0)),
+                .pfn            = __phys_to_pfn(GEMINI_GPIO_BASE(0)),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = IO_ADDRESS(GEMINI_GPIO_BASE(1)),
+                .pfn            = __phys_to_pfn(GEMINI_GPIO_BASE(1)),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = IO_ADDRESS(GEMINI_GPIO_BASE(2)),
+                .pfn            = __phys_to_pfn(GEMINI_GPIO_BASE(2)),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = IO_ADDRESS(GEMINI_FLASH_CTRL_BASE),
+                .pfn            = __phys_to_pfn(GEMINI_FLASH_CTRL_BASE),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = IO_ADDRESS(GEMINI_DRAM_CTRL_BASE),
+                .pfn            = __phys_to_pfn(GEMINI_DRAM_CTRL_BASE),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = IO_ADDRESS(GEMINI_GENERAL_DMA_BASE),
+                .pfn            = __phys_to_pfn(GEMINI_GENERAL_DMA_BASE),
+                .length         = SZ_512K,
+                .type           = MT_DEVICE,
+        },
+};
+
+void __init gemini_map_io(void)
+{
+        iotable_init(gemini_io_desc, ARRAY_SIZE(gemini_io_desc));
+}