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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (44 commits)
  [ARM] 3541/2: workaround for PXA27x erratum E7
  [ARM] nommu: provide a way for correct control register value selection
  [ARM] 3705/1: add supersection support to ioremap()
  [ARM] 3707/1: iwmmxt: use the generic thread notifier infrastructure
  [ARM] 3706/2: ep93xx: add cirrus logic edb9315a support
  [ARM] 3704/1: format IOP Kconfig with tabs, create more consistency
  [ARM] 3703/1: Add help description for ARCH_EP80219
  [ARM] 3678/1: MMC: Make OMAP MMC work
  [ARM] 3677/1: OMAP: Update H2 defconfig
  [ARM] 3676/1: ARM: OMAP: Fix dmtimers and timer32k to compile on OMAP1
  [ARM] Add section support to ioremap
  [ARM] Fix sa11x0 SDRAM selection
  [ARM] Set bit 4 on section mappings correctly depending on CPU
  [ARM] 3666/1: TRIZEPS4 [1/5] core
  ARM: OMAP: Multiplexing for 24xx GPMC wait pin monitoring
  ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE
  ARM: OMAP: Update dmtimers
  ARM: OMAP: Make clock variables static
  ARM: OMAP: Fix GPMC compilation when DEBUG is defined
  ARM: OMAP: Mux updates for external DMA and GPIO
  ...

4 files changed, 76 insertions, 23 deletions

diff --git a/arch/arm/mach-at91rm9200/Kconfig b/arch/arm/mach-at91rm9200/Kconfig
index 70d402f76ce5..2f85e8693b1b 100644
--- a/arch/arm/mach-at91rm9200/Kconfig
+++ b/arch/arm/mach-at91rm9200/Kconfig
@@ -1,6 +1,21 @@
-if ARCH_AT91RM9200
+if ARCH_AT91
+
+menu "Atmel AT91 System-on-Chip"
+
+comment "Atmel AT91 Processors"
+
+config ARCH_AT91RM9200
+        bool "AT91RM9200"
 
-menu "AT91RM9200 Implementations"
+config ARCH_AT91SAM9260
+        bool "AT91SAM9260"
+
+config ARCH_AT91SAM9261
+        bool "AT91SAM9261"
+
+# ----------------------------------------------------------
+
+if ARCH_AT91RM9200
 
 comment "AT91RM9200 Board Type"
 
@@ -8,58 +23,87 @@ config MACH_ONEARM
         bool "Ajeco 1ARM Single Board Computer"
         depends on ARCH_AT91RM9200
         help
-          Select this if you are using Ajeco's 1ARM Single Board Computer
+          Select this if you are using Ajeco's 1ARM Single Board Computer.
+          <http://www.ajeco.fi/products.htm>
 
 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
+          Select this if you are using Atmel's AT91RM9200-DK Development board.
+          (Discontinued)
+
 
 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
+          Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit.
+          <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507>
 
 config MACH_CSB337
-        bool "Cogent CSB337 board"
+        bool "Cogent CSB337"
         depends on ARCH_AT91RM9200
         help
-          Select this if you are using Cogent's CSB337 board
+          Select this if you are using Cogent's CSB337 board.
+          <http://www.cogcomp.com/csb_csb337.htm>
 
 config MACH_CSB637
-        bool "Cogent CSB637 board"
+        bool "Cogent CSB637"
         depends on ARCH_AT91RM9200
         help
-          Select this if you are using Cogent's CSB637 board
+          Select this if you are using Cogent's CSB637 board.
+          <http://www.cogcomp.com/csb_csb637.htm>
 
 config MACH_CARMEVA
-        bool "Conitec's ARM&EVA"
+        bool "Conitec ARM&EVA"
         depends on ARCH_AT91RM9200
         help
-          Select this if you are using Conitec's AT91RM9200-MCU-Module
+          Select this if you are using Conitec's AT91RM9200-MCU-Module.
+          <http://www.conitec.net/english/linuxboard.htm>
 
-config MACH_KB9200
-        bool "KwikByte's KB920x"
+config MACH_ATEB9200
+        bool "Embest ATEB9200"
         depends on ARCH_AT91RM9200
         help
-          Select this if you are using KwikByte's KB920x board
+          Select this if you are using Embest's ATEB9200 board.
+          <http://www.embedinfo.com/english/product/ATEB9200.asp>
 
-config MACH_ATEB9200
-        bool "Embest's ATEB9200"
+config MACH_KB9200
+        bool "KwikByte KB920x"
         depends on ARCH_AT91RM9200
         help
-          Select this if you are using Embest's ATEB9200 board
+          Select this if you are using KwikByte's KB920x board.
+          <http://kwikbyte.com/KB9202_description_new.htm>
 
 config MACH_KAFA
         bool "Sperry-Sun KAFA board"
         depends on ARCH_AT91RM9200
         help
-          Select this if you are using Sperry-Sun's KAFA board
+          Select this if you are using Sperry-Sun's KAFA board.
+
+endif
+
+# ----------------------------------------------------------
+
+if ARCH_AT91SAM9260
+
+comment "AT91SAM9260 Board Type"
+
+endif
+
+# ----------------------------------------------------------
+
+if ARCH_AT91SAM9261
+
+comment "AT91SAM9261 Board Type"
+
+endif
+
 
+# ----------------------------------------------------------
 
-comment "AT91RM9200 Feature Selections"
+comment "AT91 Feature Selections"
 
 config AT91_PROGRAMMABLE_CLOCKS
         bool "Programmable Clocks"
diff --git a/arch/arm/mach-at91rm9200/Makefile b/arch/arm/mach-at91rm9200/Makefile
index 82db957322df..c174805c24e5 100644
--- a/arch/arm/mach-at91rm9200/Makefile
+++ b/arch/arm/mach-at91rm9200/Makefile
@@ -2,14 +2,19 @@
 # Makefile for the linux kernel.
 #
 
-obj-y           := clock.o irq.o time.o gpio.o common.o devices.o
+obj-y           := clock.o irq.o gpio.o devices.o
 obj-m           :=
 obj-n           :=
 obj-            :=
 
 obj-$(CONFIG_PM)                += pm.o
 
-# Board-specific support
+# CPU-specific support
+obj-$(CONFIG_ARCH_AT91RM9200)   += at91rm9200.o at91rm9200_time.o
+obj-$(CONFIG_ARCH_AT91SAM9260)  +=
+obj-$(CONFIG_ARCH_AT91SAM9261)  +=
+
+# AT91RM9200 Board-specific support
 obj-$(CONFIG_MACH_ONEARM)       += board-1arm.o
 obj-$(CONFIG_ARCH_AT91RM9200DK) += board-dk.o
 obj-$(CONFIG_MACH_AT91RM9200EK) += board-ek.o
@@ -20,6 +25,10 @@ obj-$(CONFIG_MACH_KB9200)	+= board-kb9202.o
 obj-$(CONFIG_MACH_ATEB9200)     += board-eb9200.o
 obj-$(CONFIG_MACH_KAFA)         += board-kafa.o
 
+# AT91SAM9260 board-specific support
+
+# AT91SAM9261 board-specific support
+
 # LEDs support
 led-$(CONFIG_ARCH_AT91RM9200DK) += leds.o
 led-$(CONFIG_MACH_AT91RM9200EK) += leds.o
diff --git a/arch/arm/mach-at91rm9200/common.c b/arch/arm/mach-at91rm9200/at91rm9200.c
index cc55f4c28d95..7e1d072bdd80 100644
--- a/arch/arm/mach-at91rm9200/common.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-at91rm9200/common.c
+ * arch/arm/mach-at91rm9200/at91rm9200.c
  *
  *  Copyright (C) 2005 SAN People
  *
diff --git a/arch/arm/mach-at91rm9200/time.c b/arch/arm/mach-at91rm9200/at91rm9200_time.c
index f2f080350ccb..dc38e06ada63 100644
--- a/arch/arm/mach-at91rm9200/time.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200_time.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-at91rm9200/time.c
+ * linux/arch/arm/mach-at91rm9200/at91rm9200_time.c
  *
  *  Copyright (C) 2003 SAN People
  *  Copyright (C) 2003 ATMEL