Commit 73a59c1c authored by SAN People's avatar SAN People Committed by Russell King
Browse files

[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: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 50365c57

arch/arm/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -210,6 +210,12 @@ config ARCH_AAEC2000 
	help

	  This enables support for systems based on the Agilent AAEC-2000



config ARCH_AT91RM9200

	bool "AT91RM9200"

	help

	  Say Y here if you intend to run this kernel on an AT91RM9200-based

	  board.



endchoice



source "arch/arm/mach-clps711x/Kconfig"
@@ -248,6 +254,8 @@ source "arch/arm/mach-aaec2000/Kconfig" 


source "arch/arm/mach-realview/Kconfig"



source "arch/arm/mach-at91rm9200/Kconfig"



# Definitions to make life easier

config ARCH_ACORN

	bool
@@ -413,7 +421,8 @@ config LEDS 
		   ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \

		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91RM9200

	help

	  If you say Y here, the LEDs on your machine will be used

	  to provide useful information about your current system status.

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ endif 
 machine-$(CONFIG_ARCH_H720X)	   := h720x

 machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000

 machine-$(CONFIG_ARCH_REALVIEW)   := realview

 machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.

arch/arm/boot/compressed/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/boot/compressed/head-at91rm9200.S

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * 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:

arch/arm/mach-at91rm9200/Kconfig

0 → 100644
+54 −0
Original line number Diff line number Diff line 
if ARCH_AT91RM9200



menu "AT91RM9200 Implementations"



comment "AT91RM9200 Board Type"



config ARCH_AT91RM9200DK

	bool "Atmel AT91RM9200-DK Development board"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Atmel's AT91RM9200-DK Development board



config MACH_AT91RM9200EK

	bool "Atmel AT91RM9200-EK Evaluation Kit"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit



config MACH_CSB337

	bool "Cogent CSB337 board"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Cogent's CSB337 board



config MACH_CSB637

	bool "Cogent CSB637 board"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Cogent's CSB637 board



config MACH_CARMEVA

	bool "Conitec's ARM&EVA"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Conitec's AT91RM9200-MCU-Module



config MACH_KB9200

	bool "KwikByte's KB920x"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using KwikByte's KB920x board





comment "AT91RM9200 Feature Selections"



config AT91_PROGRAMMABLE_CLOCKS

	bool "Programmable Clocks"

	help

	  Select this if you need to program one or more of the PCK0..PCK3

	  programmable clock outputs.



endmenu



endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE