1 files changed, 108 insertions, 47 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3b181284970..c5408bf1bf4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -155,6 +155,9 @@ config ARCH_MAY_HAVE_PC_FDC
 config ZONE_DMA
         bool
 
+config NEED_DMA_MAP_STATE
+       def_bool y
+
 config GENERIC_ISA_DMA
         bool
 
@@ -215,6 +218,10 @@ config MMU
           Select if you want MMU-based virtualised addressing space
           support by paged memory management. If unsure, say 'Y'.
 
+#
+# The "ARM system type" choice list is ordered alphabetically by option
+# text.  Please add new entries in the option alphabetic order.
+#
 choice
         prompt "ARM system type"
         default ARCH_VERSATILE
@@ -271,6 +278,18 @@ config ARCH_AT91
           This enables support for systems based on the Atmel AT91RM9200,
           AT91SAM9 and AT91CAP9 processors.
 
+config ARCH_BCMRING
+        bool "Broadcom BCMRING"
+        depends on MMU
+        select CPU_V6
+        select ARM_AMBA
+        select COMMON_CLKDEV
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        help
+          Support for Broadcom's BCMRing platform.
+
 config ARCH_CLPS711X
         bool "Cirrus Logic CLPS711x/EP721x-based"
         select CPU_ARM720T
@@ -321,10 +340,9 @@ config ARCH_MXC
         bool "Freescale MXC/iMX-based"
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
-        select ARCH_MTD_XIP
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         select HAVE_CLK
+        select COMMON_CLKDEV
         help
           Support for Freescale MXC/iMX-based family of processors
 
@@ -357,20 +375,6 @@ config ARCH_H720X
         help
           This enables support for systems based on the Hynix HMS720x
 
-config ARCH_NOMADIK
-        bool "STMicroelectronics Nomadik"
-        select ARM_AMBA
-        select ARM_VIC
-        select CPU_ARM926T
-        select HAVE_CLK
-        select COMMON_CLKDEV
-        select GENERIC_TIME
-        select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
-        help
-          Support for the Nomadik platform by ST-Ericsson
-
 config ARCH_IOP13XX
         bool "IOP13xx-based"
         depends on MMU
@@ -508,7 +512,7 @@ config ARCH_ORION5X
           Orion-2 (5281), Orion-1-90 (6183).
 
 config ARCH_MMP
-        bool "Marvell PXA168/910"
+        bool "Marvell PXA168/910/MMP2"
         depends on MMU
         select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
@@ -519,7 +523,7 @@ config ARCH_MMP
         select TICK_ONESHOT
         select PLAT_PXA
         help
-          Support for Marvell's PXA168/910 processor line.
+          Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.
 
 config ARCH_KS8695
         bool "Micrel/Kendin KS8695"
@@ -605,6 +609,11 @@ config ARCH_MSM
           interface to the ARM9 modem processor which runs the baseband stack
           and controls some vital subsystems (clock and power control, etc).
 
+config ARCH_SHMOBILE
+        bool "Renesas SH-Mobile"
+        help
+          Support for Renesas's SH-Mobile ARM platforms
+
 config ARCH_RPC
         bool "RiscPC"
         select ARCH_ACORN
@@ -648,12 +657,43 @@ config ARCH_S3C2410
 
 config ARCH_S3C64XX
         bool "Samsung S3C64XX"
+        select PLAT_SAMSUNG
+        select CPU_V6
         select GENERIC_GPIO
+        select ARM_VIC
         select HAVE_CLK
+        select NO_IOPORT
         select ARCH_HAS_CPUFREQ
+        select ARCH_REQUIRE_GPIOLIB
+        select SAMSUNG_CLKSRC
+        select SAMSUNG_IRQ_VIC_TIMER
+        select SAMSUNG_IRQ_UART
+        select S3C_GPIO_TRACK
+        select S3C_GPIO_PULL_UPDOWN
+        select S3C_GPIO_CFG_S3C24XX
+        select S3C_GPIO_CFG_S3C64XX
+        select S3C_DEV_NAND
+        select USB_ARCH_HAS_OHCI
+        select SAMSUNG_GPIOLIB_4BIT
         help
           Samsung S3C64XX series based systems
 
+config ARCH_S5P6440
+        bool "Samsung S5P6440"
+        select CPU_V6
+        select GENERIC_GPIO
+        select HAVE_CLK
+        help
+          Samsung S5P6440 CPU based systems
+
+config ARCH_S5P6442
+        bool "Samsung S5P6442"
+        select CPU_V6
+        select GENERIC_GPIO
+        select HAVE_CLK
+        help
+          Samsung S5P6442 CPU based systems
+
 config ARCH_S5PC1XX
         bool "Samsung S5PC1XX"
         select GENERIC_GPIO
@@ -663,6 +703,15 @@ config ARCH_S5PC1XX
         help
           Samsung S5PC1XX series based systems
 
+config ARCH_S5PV210
+        bool "Samsung S5PV210/S5PC110"
+        select CPU_V7
+        select GENERIC_GPIO
+        select HAVE_CLK
+        select ARM_L1_CACHE_SHIFT_6
+        help
+          Samsung S5PV210/S5PC110 series based systems
+
 config ARCH_SHARK
         bool "Shark"
         select CPU_SA110
@@ -700,6 +749,30 @@ config ARCH_U300
         help
           Support for ST-Ericsson U300 series mobile platforms.
 
+config ARCH_U8500
+        bool "ST-Ericsson U8500 Series"
+        select CPU_V7
+        select ARM_AMBA
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select COMMON_CLKDEV
+        help
+          Support for ST-Ericsson's Ux500 architecture
+
+config ARCH_NOMADIK
+        bool "STMicroelectronics Nomadik"
+        select ARM_AMBA
+        select ARM_VIC
+        select CPU_ARM926T
+        select HAVE_CLK
+        select COMMON_CLKDEV
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        help
+          Support for the Nomadik platform by ST-Ericsson
+
 config ARCH_DAVINCI
         bool "TI DaVinci"
         select CPU_ARM926T
@@ -728,30 +801,13 @@ config ARCH_OMAP
         help
           Support for TI's OMAP platform (OMAP1 and OMAP2).
 
-config ARCH_BCMRING
-        bool "Broadcom BCMRING"
-        depends on MMU
-        select CPU_V6
-        select ARM_AMBA
-        select COMMON_CLKDEV
-        select GENERIC_TIME
-        select GENERIC_CLOCKEVENTS
-        select ARCH_WANT_OPTIONAL_GPIOLIB
-        help
-          Support for Broadcom's BCMRing platform.
-
-config ARCH_U8500
-        bool "ST-Ericsson U8500 Series"
-        select CPU_V7
-        select ARM_AMBA
-        select GENERIC_TIME
-        select GENERIC_CLOCKEVENTS
-        select COMMON_CLKDEV
-        help
-          Support for ST-Ericsson's Ux500 architecture
-
 endchoice
 
+#
+# This is sorted alphabetically by mach-* pathname.  However, plat-*
+# Kconfigs may be included either alphabetically (according to the
+# plat- suffix) or along side the corresponding mach-* source.
+#
 source "arch/arm/mach-aaec2000/Kconfig"
 
 source "arch/arm/mach-at91/Kconfig"
@@ -828,8 +884,7 @@ source "arch/arm/mach-sa1100/Kconfig"
 
 source "arch/arm/plat-samsung/Kconfig"
 source "arch/arm/plat-s3c24xx/Kconfig"
-source "arch/arm/plat-s3c64xx/Kconfig"
-source "arch/arm/plat-s3c/Kconfig"
+source "arch/arm/plat-s5p/Kconfig"
 source "arch/arm/plat-s5pc1xx/Kconfig"
 
 if ARCH_S3C2410
@@ -837,21 +892,27 @@ source "arch/arm/mach-s3c2400/Kconfig"
 source "arch/arm/mach-s3c2410/Kconfig"
 source "arch/arm/mach-s3c2412/Kconfig"
 source "arch/arm/mach-s3c2440/Kconfig"
-source "arch/arm/mach-s3c2442/Kconfig"
 source "arch/arm/mach-s3c2443/Kconfig"
 endif
 
 if ARCH_S3C64XX
-source "arch/arm/mach-s3c6400/Kconfig"
-source "arch/arm/mach-s3c6410/Kconfig"
+source "arch/arm/mach-s3c64xx/Kconfig"
 endif
 
-source "arch/arm/plat-stmp3xxx/Kconfig"
+source "arch/arm/mach-s5p6440/Kconfig"
+
+source "arch/arm/mach-s5p6442/Kconfig"
 
 if ARCH_S5PC1XX
 source "arch/arm/mach-s5pc100/Kconfig"
 endif
 
+source "arch/arm/mach-s5pv210/Kconfig"
+
+source "arch/arm/mach-shmobile/Kconfig"
+
+source "arch/arm/plat-stmp3xxx/Kconfig"
+
 source "arch/arm/mach-u300/Kconfig"
 
 source "arch/arm/mach-ux500/Kconfig"
@@ -1117,7 +1178,7 @@ source kernel/Kconfig.preempt
 config HZ
         int
         default 128 if ARCH_L7200
-        default 200 if ARCH_EBSA110 || ARCH_S3C2410
+        default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
         default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
         default AT91_TIMER_HZ if ARCH_AT91
         default 100