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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (130 commits)
  [ARM] 3856/1: Add clocksource for Intel IXP4xx platforms
  [ARM] 3855/1: Add generic time support
  [ARM] 3873/1: S3C24XX: Add irq_chip names
  [ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips
  [ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23
  [ARM] nommu: confirms the CR_V bit in nommu mode
  [ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
  [ARM] 3870/1: AT91: Start removing static memory mappings
  [ARM] 3869/1: AT91: NAND support for DK and KB9202 boards
  [ARM] 3868/1: AT91 hardware header update
  [ARM] 3867/1: AT91 GPIO update
  [ARM] 3866/1: AT91 clock update
  [ARM] 3865/1: AT91RM9200 header updates
  [ARM] 3862/2: S3C2410 - add basic power management support for AML M5900 series
  [ARM] kthread: switch arch/arm/kernel/apm.c
  [ARM] Off-by-one in arch/arm/common/icst*
  [ARM] 3864/1: Refactore sharpsl_pm
  [ARM] 3863/1: Add Locomo SPI Device
  [ARM] 3847/2:  Convert LOMOMO to use struct device for GPIOs
  [ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
  ...

1 files changed, 134 insertions, 0 deletions

diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
new file mode 100644
index 000000000000..918ebf65d4f6
--- /dev/null
+++ b/arch/arm/mm/proc-arm9tdmi.S
@@ -0,0 +1,134 @@
+/*
+ *  linux/arch/arm/mm/proc-arm9tdmi.S: utility functions for ARM9TDMI
+ *
+ *  Copyright (C) 2003-2006 Hyok S. Choi <hyok.choi@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/linkage.h>
+#include <linux/init.h>
+#include <asm/assembler.h>
+#include <asm/asm-offsets.h>
+#include <asm/pgtable-hwdef.h>
+#include <asm/pgtable.h>
+#include <asm/procinfo.h>
+#include <asm/ptrace.h>
+
+        .text
+/*
+ * cpu_arm9tdmi_proc_init()
+ * cpu_arm9tdmi_do_idle()
+ * cpu_arm9tdmi_dcache_clean_area()
+ * cpu_arm9tdmi_switch_mm()
+ *
+ * These are not required.
+ */
+ENTRY(cpu_arm9tdmi_proc_init)
+ENTRY(cpu_arm9tdmi_do_idle)
+ENTRY(cpu_arm9tdmi_dcache_clean_area)
+ENTRY(cpu_arm9tdmi_switch_mm)
+                mov     pc, lr
+
+/*
+ * cpu_arm9tdmi_proc_fin()
+ */
+ENTRY(cpu_arm9tdmi_proc_fin)
+                mov     r0, #PSR_F_BIT | PSR_I_BIT | SVC_MODE
+                msr     cpsr_c, r0
+                mov     pc, lr
+
+/*
+ * Function: cpu_arm9tdmi_reset(loc)
+ * Params  : loc(r0)    address to jump to
+ * Purpose : Sets up everything for a reset and jump to the location for soft reset.
+ */
+ENTRY(cpu_arm9tdmi_reset)
+                mov     pc, r0
+
+                __INIT
+
+                .type   __arm9tdmi_setup, #function
+__arm9tdmi_setup:
+                mov     pc, lr
+                .size   __arm9tdmi_setup, . - __arm9tdmi_setup
+
+                __INITDATA
+
+/*
+ * Purpose : Function pointers used to access above functions - all calls
+ *           come through these
+ */
+                .type   arm9tdmi_processor_functions, #object
+ENTRY(arm9tdmi_processor_functions)
+                .word   nommu_early_abort
+                .word   cpu_arm9tdmi_proc_init
+                .word   cpu_arm9tdmi_proc_fin
+                .word   cpu_arm9tdmi_reset
+                .word   cpu_arm9tdmi_do_idle
+                .word   cpu_arm9tdmi_dcache_clean_area
+                .word   cpu_arm9tdmi_switch_mm
+                .word   0               @ cpu_*_set_pte
+                .size   arm9tdmi_processor_functions, . - arm9tdmi_processor_functions
+
+                .section ".rodata"
+
+                .type   cpu_arch_name, #object
+cpu_arch_name:
+                .asciz  "armv4t"
+                .size   cpu_arch_name, . - cpu_arch_name
+
+                .type   cpu_elf_name, #object
+cpu_elf_name:
+                .asciz  "v4"
+                .size   cpu_elf_name, . - cpu_elf_name
+
+                .type   cpu_arm9tdmi_name, #object
+cpu_arm9tdmi_name:
+                .asciz  "ARM9TDMI"
+                .size   cpu_arm9tdmi_name, . - cpu_arm9tdmi_name
+
+                .type   cpu_p2001_name, #object
+cpu_p2001_name:
+                .asciz  "P2001"
+                .size   cpu_p2001_name, . - cpu_p2001_name
+
+                .align
+
+                .section ".proc.info.init", #alloc, #execinstr
+
+                .type   __arm9tdmi_proc_info, #object
+__arm9tdmi_proc_info:
+                .long   0x41009900
+                .long   0xfff8ff00
+                .long   0
+                .long   0
+                b       __arm9tdmi_setup
+                .long   cpu_arch_name
+                .long   cpu_elf_name
+                .long   HWCAP_SWP | HWCAP_THUMB | HWCAP_26BIT
+                .long   cpu_arm9tdmi_name
+                .long   arm9tdmi_processor_functions
+                .long   0
+                .long   0
+                .long   v4_cache_fns
+                .size   __arm9tdmi_proc_info, . - __arm9dmi_proc_info
+
+                .type   __p2001_proc_info, #object
+__p2001_proc_info:
+                .long   0x41029000
+                .long   0xffffffff
+                .long   0
+                .long   0
+                b       __arm9tdmi_setup
+                .long   cpu_arch_name
+                .long   cpu_elf_name
+                .long   HWCAP_SWP | HWCAP_THUMB | HWCAP_26BIT
+                .long   cpu_p2001_name
+                .long   arm9tdmi_processor_functions
+                .long   0
+                .long   0
+                .long   v4_cache_fns
+                .size   __p2001_proc_info, . - __p2001_proc_info