Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / arch / arm / mach-at91 / Kconfig

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index e238ad8cfd8fefbe7d78b3692eb1892140223ad8..5b0422cdde76e7504010d8b4a8971ef3d0ca7455 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -7,6 +7,8 @@ choice
 
 config ARCH_AT91RM9200
        bool "AT91RM9200"
 
 config ARCH_AT91RM9200
        bool "AT91RM9200"

+       select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS

 
 config ARCH_AT91SAM9260
        bool "AT91SAM9260 or AT91SAM9XE"
 
 config ARCH_AT91SAM9260
        bool "AT91SAM9260 or AT91SAM9XE"


@@ -17,8 +19,21 @@ config ARCH_AT91SAM9261
 config ARCH_AT91SAM9263
        bool "AT91SAM9263"
 
 config ARCH_AT91SAM9263
        bool "AT91SAM9263"
 

+config ARCH_AT91SAM9RL
+       bool "AT91SAM9RL"
+
+config ARCH_AT91CAP9
+       bool "AT91CAP9"
+
+config ARCH_AT91X40
+       bool "AT91x40"
+

 endchoice
 
 endchoice
 

+config AT91_PMC_UNIT
+       bool
+       default !ARCH_AT91X40
+

 # ----------------------------------------------------------
 
 if ARCH_AT91RM9200
 # ----------------------------------------------------------
 
 if ARCH_AT91RM9200


@@ -107,7 +122,7 @@ config ARCH_AT91SAM9260_SAM9XE
        depends on ARCH_AT91SAM9260
        help
          Select this if you are using Atmel's AT91SAM9XE System-on-Chip.
        depends on ARCH_AT91SAM9260
        help
          Select this if you are using Atmel's AT91SAM9XE System-on-Chip.

-         They are basicaly AT91SAM9260s with various sizes of embedded Flash.
+         They are basically AT91SAM9260s with various sizes of embedded Flash.

 
 comment "AT91SAM9260 / AT91SAM9XE Board Type"
 
 
 comment "AT91SAM9260 / AT91SAM9XE Board Type"
 


@@ -152,17 +167,62 @@ endif
 
 # ----------------------------------------------------------
 
 
 # ----------------------------------------------------------
 

+if ARCH_AT91SAM9RL
+
+comment "AT91SAM9RL Board Type"
+
+config MACH_AT91SAM9RLEK
+       bool "Atmel AT91SAM9RL-EK Evaluation Kit"
+       depends on ARCH_AT91SAM9RL
+       help
+         Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit.
+
+endif
+
+# ----------------------------------------------------------
+
+if ARCH_AT91CAP9
+
+comment "AT91CAP9 Board Type"
+
+config MACH_AT91CAP9ADK
+       bool "Atmel AT91CAP9A-DK Evaluation Kit"
+       depends on ARCH_AT91CAP9
+       help
+         Select this if you are using Atmel's AT91CAP9A-DK Evaluation Kit.
+         <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4138>
+
+endif
+
+# ----------------------------------------------------------
+
+if ARCH_AT91X40
+
+comment "AT91X40 Board Type"
+
+config MACH_AT91EB01
+       bool "Atmel AT91EB01 Evaluation Kit"
+       help
+         Select this if you are using Atmel's AT91EB01 Evaluation Kit.
+         It is also a popular target for simulators such as GDB's
+         ARM simulator (commonly known as the ARMulator) and the
+         Skyeye simulator.
+
+endif
+
+# ----------------------------------------------------------
+

 comment "AT91 Board Options"
 
 config MTD_AT91_DATAFLASH_CARD
        bool "Enable DataFlash Card support"
 comment "AT91 Board Options"
 
 config MTD_AT91_DATAFLASH_CARD
        bool "Enable DataFlash Card support"

-       depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK)
+       depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91CAP9ADK)

        help
          Enable support for the DataFlash card.
 
 config MTD_NAND_AT91_BUSWIDTH_16
        bool "Enable 16-bit data bus interface to NAND flash"
        help
          Enable support for the DataFlash card.
 
 config MTD_NAND_AT91_BUSWIDTH_16
        bool "Enable 16-bit data bus interface to NAND flash"

-       depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK)
+       depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91CAP9ADK)

        help
          On AT91SAM926x boards both types of NAND flash can be present
          (8 and 16 bit data bus width).
        help
          On AT91SAM926x boards both types of NAND flash can be present
          (8 and 16 bit data bus width).


@@ -177,6 +237,22 @@ config AT91_PROGRAMMABLE_CLOCKS
          Select this if you need to program one or more of the PCK0..PCK3
          programmable clock outputs.
 
          Select this if you need to program one or more of the PCK0..PCK3
          programmable clock outputs.
 

+config AT91_TIMER_HZ
+       int "Kernel HZ (jiffies per second)"
+       range 32 1024
+       depends on ARCH_AT91
+       default "128" if ARCH_AT91RM9200
+       default "100"
+       help
+         On AT91rm9200 chips where you're using a system clock derived
+         from the 32768 Hz hardware clock, this tick rate should divide
+         it exactly: use a power-of-two value, such as 128 or 256, to
+         reduce timing errors caused by rounding.
+
+         On AT91sam926x chips, or otherwise when using a higher precision
+         system clock (of at least several MHz), rounding is less of a
+         problem so it can be safer to use a decimal values like 100.
+

 endmenu
 
 endif
 endmenu
 
 endif