Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux-2.6-microblaze.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 859b49d..229f2cd 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -7,6 +7,8 @@ config ARM
        select ARCH_HAS_BINFMT_FLAT
        select ARCH_HAS_DEBUG_VIRTUAL if MMU
        select ARCH_HAS_DEVMEM_IS_ALLOWED
+       select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB
+       select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_FORTIFY_SOURCE
        select ARCH_HAS_KEEPINITRD
@@ -18,6 +20,8 @@ config ARM
        select ARCH_HAS_SET_MEMORY
        select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL
        select ARCH_HAS_STRICT_MODULE_RWX if MMU
+       select ARCH_HAS_SYNC_DMA_FOR_DEVICE if SWIOTLB
+       select ARCH_HAS_SYNC_DMA_FOR_CPU if SWIOTLB
        select ARCH_HAS_TEARDOWN_DMA_OPS if MMU
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_HAVE_CUSTOM_GPIO_H
@@ -263,8 +267,6 @@ config PHYS_OFFSET
        default 0x00000000 if ARCH_EBSA110 || \
                        ARCH_FOOTBRIDGE || \
                        ARCH_INTEGRATOR || \
-                       ARCH_IOP13XX || \
-                       ARCH_KS8695 || \
                        ARCH_REALVIEW
        default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
        default 0x20000000 if ARCH_S5PV210
@@ -377,19 +379,6 @@ config ARCH_FOOTBRIDGE
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
 
-config ARCH_IOP13XX
-       bool "IOP13xx-based"
-       depends on MMU
-       select CPU_XSC3
-       select NEED_MACH_MEMORY_H
-       select NEED_RET_TO_USER
-       select FORCE_PCI
-       select PLAT_IOP
-       select VMSPLIT_1G
-       select SPARSE_IRQ
-       help
-         Support for Intel's IOP13XX (XScale) family of processors.
-
 config ARCH_IOP32X
        bool "IOP32x-based"
        depends on MMU
@@ -403,18 +392,6 @@ config ARCH_IOP32X
          Support for Intel's 80219 and IOP32X (XScale) family of
          processors.
 
-config ARCH_IOP33X
-       bool "IOP33x-based"
-       depends on MMU
-       select CPU_XSCALE
-       select GPIO_IOP
-       select GPIOLIB
-       select NEED_RET_TO_USER
-       select FORCE_PCI
-       select PLAT_IOP
-       help
-         Support for Intel's IOP33X (XScale) family of processors.
-
 config ARCH_IXP4XX
        bool "IXP4xx-based"
        depends on MMU
@@ -451,48 +428,6 @@ config ARCH_DOVE
        help
          Support for the Marvell Dove SoC 88AP510
 
-config ARCH_KS8695
-       bool "Micrel/Kendin KS8695"
-       select CLKSRC_MMIO
-       select CPU_ARM922T
-       select GENERIC_CLOCKEVENTS
-       select GPIOLIB
-       select NEED_MACH_MEMORY_H
-       help
-         Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
-         System-on-Chip devices.
-
-config ARCH_W90X900
-       bool "Nuvoton W90X900 CPU"
-       select CLKDEV_LOOKUP
-       select CLKSRC_MMIO
-       select CPU_ARM926T
-       select GENERIC_CLOCKEVENTS
-       select GPIOLIB
-       help
-         Support for Nuvoton (Winbond logic dept.) ARM9 processor,
-         At present, the w90x900 has been renamed nuc900, regarding
-         the ARM series product line, you can login the following
-         link address to know more.
-
-         <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
-               ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>
-
-config ARCH_LPC32XX
-       bool "NXP LPC32XX"
-       select ARM_AMBA
-       select CLKDEV_LOOKUP
-       select CLKSRC_LPC32XX
-       select COMMON_CLK
-       select CPU_ARM926T
-       select GENERIC_CLOCKEVENTS
-       select GENERIC_IRQ_MULTI_HANDLER
-       select GPIOLIB
-       select SPARSE_IRQ
-       select USE_OF
-       help
-         Support for the NXP LPC32XX family of processors
-
 config ARCH_PXA
        bool "PXA2xx/PXA3xx-based"
        depends on MMU
@@ -578,27 +513,6 @@ config ARCH_S3C24XX
          (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the
          Samsung SMDK2410 development board (and derivatives).
 
-config ARCH_DAVINCI
-       bool "TI DaVinci"
-       select ARCH_HAS_HOLES_MEMORYMODEL
-       select COMMON_CLK
-       select CPU_ARM926T
-       select GENERIC_ALLOCATOR
-       select GENERIC_CLOCKEVENTS
-       select GENERIC_IRQ_CHIP
-       select GENERIC_IRQ_MULTI_HANDLER
-       select GPIOLIB
-       select HAVE_IDE
-       select PM_GENERIC_DOMAINS if PM
-       select PM_GENERIC_DOMAINS_OF if PM && OF
-       select REGMAP_MMIO
-       select RESET_CONTROLLER
-       select SPARSE_IRQ
-       select USE_OF
-       select ZONE_DMA
-       help
-         Support for TI's DaVinci platform.
-
 config ARCH_OMAP1
        bool "TI OMAP1"
        depends on MMU
@@ -734,17 +648,13 @@ source "arch/arm/mach-imx/Kconfig"
 
 source "arch/arm/mach-integrator/Kconfig"
 
-source "arch/arm/mach-iop13xx/Kconfig"
-
 source "arch/arm/mach-iop32x/Kconfig"
 
-source "arch/arm/mach-iop33x/Kconfig"
-
 source "arch/arm/mach-ixp4xx/Kconfig"
 
 source "arch/arm/mach-keystone/Kconfig"
 
-source "arch/arm/mach-ks8695/Kconfig"
+source "arch/arm/mach-lpc32xx/Kconfig"
 
 source "arch/arm/mach-mediatek/Kconfig"
 
@@ -830,8 +740,6 @@ source "arch/arm/plat-versatile/Kconfig"
 
 source "arch/arm/mach-vt8500/Kconfig"
 
-source "arch/arm/mach-w90x900/Kconfig"
-
 source "arch/arm/mach-zx/Kconfig"
 
 source "arch/arm/mach-zynq/Kconfig"