[ARM] 3240/2: AT91RM9200 support for 2.6 (Core)

Patch from SAN People

Following changes were made to clock.c:

1) Replaced <asm/hardware/clock.h> with <linux/clk.h>
2) Removed old unused clk_enable & clk_disable.
3) Replaced clk_use/clk_unuse with clk_enable/clk_disable.

Otherwise it's the same as the previous patch.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 61 insertions, 0 deletions

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 0009a80498cc..35ffe0f4ece7 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -46,6 +46,10 @@ ifeq ($(CONFIG_PXA_SHARPSL),y)
 OBJS            += head-sharpsl.o
 endif
 
+ifeq ($(CONFIG_ARCH_AT91RM9200),y)
+OBJS            += head-at91rm9200.o
+endif
+
 ifeq ($(CONFIG_DEBUG_ICEDCC),y)
 OBJS            += ice-dcc.o
 endif
diff --git a/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S
new file mode 100644
index 000000000000..2119ea62b547
--- /dev/null
+++ b/arch/arm/boot/compressed/head-at91rm9200.S
@@ -0,0 +1,57 @@
+/*
+ * linux/arch/arm/boot/compressed/head-at91rm9200.S
+ *
+ *  Copyright (C) 2003 SAN People
+ *
+ * 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 <asm/mach-types.h>
+
+                .section        ".start", "ax"
+
+                @ Atmel AT91RM9200-DK : 262
+                mov     r3,     #(MACH_TYPE_AT91RM9200DK & 0xff)
+                orr     r3, r3, #(MACH_TYPE_AT91RM9200DK & 0xff00)
+                cmp     r7, r3
+                beq     99f
+
+                @ Cogent CSB337 : 399
+                mov     r3,     #(MACH_TYPE_CSB337 & 0xff)
+                orr     r3, r3, #(MACH_TYPE_CSB337 & 0xff00)
+                cmp     r7, r3
+                beq     99f
+
+                @ Cogent CSB637 : 648
+                mov     r3,     #(MACH_TYPE_CSB637 & 0xff)
+                orr     r3, r3, #(MACH_TYPE_CSB637 & 0xff00)
+                cmp     r7, r3
+                beq     99f
+
+                @ Atmel AT91RM9200-EK : 705
+                mov     r3,     #(MACH_TYPE_AT91RM9200EK & 0xff)
+                orr     r3, r3, #(MACH_TYPE_AT91RM9200EK & 0xff00)
+                cmp     r7, r3
+                beq     99f
+
+                @ Conitec Carmeva : 769
+                mov     r3,     #(MACH_TYPE_CARMEVA & 0xff)
+                orr     r3, r3, #(MACH_TYPE_CARMEVA & 0xff00)
+                cmp     r7, r3
+                beq     99f
+
+                @ KwikByte KB920x : 612
+                mov     r3,     #(MACH_TYPE_KB9200 & 0xff)
+                orr     r3, r3, #(MACH_TYPE_KB9200 & 0xff00)
+                cmp     r7, r3
+                beq     99f
+
+                @ Unknown board, use the AT91RM9200DK board
+                @ mov   r7, #MACH_TYPE_AT91RM9200
+                mov     r7,     #(MACH_TYPE_AT91RM9200DK & 0xff)
+                orr     r7, r7, #(MACH_TYPE_AT91RM9200DK & 0xff00)
+
+99: