gpiolib support for the PXA architecture

[linux-2.6-omap-h63xx.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3a75a0b2bebb2f2532e6458ee3c6a029168c4f7e..e19e7744e366a3a8d14bbb7aa7fb5ab4d0d13986 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -10,6 +10,8 @@ config ARM
        default y
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION
        default y
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION

+       select HAVE_OPROFILE
+       select HAVE_KPROBES if (!XIP_KERNEL)

        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and


@@ -33,6 +35,11 @@ config GENERIC_CLOCKEVENTS
        bool
        default n
 
        bool
        default n
 

+config GENERIC_CLOCKEVENTS_BROADCAST
+       bool
+       depends on GENERIC_CLOCKEVENTS
+       default y if SMP && !LOCAL_TIMERS
+

 config MMU
        bool
        default y
 config MMU
        bool
        default y


@@ -91,6 +98,11 @@ config GENERIC_IRQ_PROBE
        bool
        default y
 
        bool
        default y
 

+config GENERIC_LOCKBREAK
+       bool
+       default y
+       depends on SMP && PREEMPT
+

 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y


@@ -130,6 +142,23 @@ config FIQ
 config ARCH_MTD_XIP
        bool
 
 config ARCH_MTD_XIP
        bool
 

+if OPROFILE
+
+config OPROFILE_ARMV6
+       def_bool y
+       depends on CPU_V6 && !SMP
+       select OPROFILE_ARM11_CORE
+
+config OPROFILE_MPCORE
+       def_bool y
+       depends on CPU_V6 && SMP
+       select OPROFILE_ARM11_CORE
+
+config OPROFILE_ARM11_CORE
+       bool
+
+endif
+

 config VECTORS_BASE
        hex
        default 0xffff0000 if MMU || CPU_HIGH_VECTOR
 config VECTORS_BASE
        hex
        default 0xffff0000 if MMU || CPU_HIGH_VECTOR


@@ -163,6 +192,8 @@ config ARCH_REALVIEW
        bool "ARM Ltd. RealView family"
        select ARM_AMBA
        select ICST307
        bool "ARM Ltd. RealView family"
        select ARM_AMBA
        select ICST307

+       select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS

        help
          This enables support for ARM Ltd RealView boards.
 
        help
          This enables support for ARM Ltd RealView boards.
 


@@ -180,8 +211,8 @@ config ARCH_AT91
        bool "Atmel AT91"
        select GENERIC_GPIO
        help
        bool "Atmel AT91"
        select GENERIC_GPIO
        help

-         This enables support for systems based on the Atmel AT91RM9200
-         and AT91SAM9xxx processors.
+         This enables support for systems based on the Atmel AT91RM9200,
+         AT91SAM9 and AT91CAP9 processors.

 
 config ARCH_CLPS7500
        bool "Cirrus CL-PS7500FE"
 
 config ARCH_CLPS7500
        bool "Cirrus CL-PS7500FE"


@@ -217,6 +248,7 @@ config ARCH_EP93XX
        bool "EP93xx-based"
        select ARM_AMBA
        select ARM_VIC
        bool "EP93xx-based"
        select ARM_AMBA
        select ARM_VIC

+       select GENERIC_GPIO

        help
          This enables support for the Cirrus EP93xx series of CPUs.
 
        help
          This enables support for the Cirrus EP93xx series of CPUs.
 


@@ -333,6 +365,16 @@ config ARCH_MXC
        help
          Support for Freescale MXC/iMX-based family of processors
 
        help
          Support for Freescale MXC/iMX-based family of processors
 

+config ARCH_ORION
+       bool "Marvell Orion"
+       depends on MMU
+       select PCI
+       select GENERIC_GPIO
+       select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS
+       help
+         Support for Marvell Orion System on Chip family.
+

 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
        help
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
        help


@@ -343,8 +385,10 @@ config ARCH_PXA
        depends on MMU
        select ARCH_MTD_XIP
        select GENERIC_GPIO
        depends on MMU
        select ARCH_MTD_XIP
        select GENERIC_GPIO

+       select HAVE_GPIO_LIB

        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS

+       select TICK_ONESHOT

        help
          Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
 
        help
          Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
 


@@ -366,6 +410,7 @@ config ARCH_SA1100
        select ARCH_DISCONTIGMEM_ENABLE
        select ARCH_MTD_XIP
        select GENERIC_GPIO
        select ARCH_DISCONTIGMEM_ENABLE
        select ARCH_MTD_XIP
        select GENERIC_GPIO

+       select GENERIC_TIME

        help
          Support for StrongARM 11x0 based boards.
 
        help
          Support for StrongARM 11x0 based boards.
 


@@ -409,6 +454,17 @@ config ARCH_OMAP
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
 
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
 

+config ARCH_MSM7X00A
+       bool "Qualcomm MSM7X00A"
+       select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS
+       help
+         Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11
+         apps processor of the MSM7X00A and depends on a shared memory
+         interface to the ARM9 modem processor which runs the baseband stack
+         and controls some vital subsystems (clock and power control, etc).
+         <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
+

 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"


@@ -441,6 +497,8 @@ source "arch/arm/mach-omap1/Kconfig"
 
 source "arch/arm/mach-omap2/Kconfig"
 
 
 source "arch/arm/mach-omap2/Kconfig"
 

+source "arch/arm/mach-orion/Kconfig"
+

 source "arch/arm/plat-s3c24xx/Kconfig"
 source "arch/arm/plat-s3c/Kconfig"
 
 source "arch/arm/plat-s3c24xx/Kconfig"
 source "arch/arm/plat-s3c/Kconfig"
 


@@ -477,6 +535,8 @@ source "arch/arm/mach-davinci/Kconfig"
 
 source "arch/arm/mach-ks8695/Kconfig"
 
 
 source "arch/arm/mach-ks8695/Kconfig"
 

+source "arch/arm/mach-msm/Kconfig"
+

 # Definitions to make life easier
 config ARCH_ACORN
        bool
 # Definitions to make life easier
 config ARCH_ACORN
        bool


@@ -544,11 +604,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 

-         The PCI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't.
-

 config PCI_SYSCALL
        def_bool PCI
 
 config PCI_SYSCALL
        def_bool PCI
 


@@ -576,7 +631,7 @@ source "kernel/time/Kconfig"
 
 config SMP
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
 
 config SMP
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"

-       depends on EXPERIMENTAL && REALVIEW_MPCORE
+       depends on EXPERIMENTAL && REALVIEW_EB_ARM11MP

        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If


@@ -588,8 +643,7 @@ config SMP
          processor machines. On a single processor machine, the kernel will
          run faster if you say N here.
 
          processor machines. On a single processor machine, the kernel will
          run faster if you say N here.
 

-         See also the <file:Documentation/smp.txt>,
-         <file:Documentation/i386/IO-APIC.txt>,
+         See also <file:Documentation/i386/IO-APIC.txt>,

          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
          <http://www.linuxdoc.org/docs.html#howto>.
 
          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
          <http://www.linuxdoc.org/docs.html#howto>.
 


@@ -610,7 +664,7 @@ config HOTPLUG_CPU
 
 config LOCAL_TIMERS
        bool "Use local timer interrupts"
 
 config LOCAL_TIMERS
        bool "Use local timer interrupts"

-       depends on SMP && REALVIEW_MPCORE
+       depends on SMP && REALVIEW_EB_ARM11MP

        default y
        help
          Enable support for local timers on SMP platforms, rather then the
        default y
        help
          Enable support for local timers on SMP platforms, rather then the


@@ -657,6 +711,7 @@ config HZ
        default 128 if ARCH_L7200
        default 200 if ARCH_EBSA110 || ARCH_S3C2410
        default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
        default 128 if ARCH_L7200
        default 200 if ARCH_EBSA110 || ARCH_S3C2410
        default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

+       default AT91_TIMER_HZ if ARCH_AT91

        default 100
 
 config AEABI
        default 100
 
 config AEABI


@@ -716,7 +771,7 @@ config LEDS
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
                   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
                   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \

-                  ARCH_KS8695
+                  ARCH_KS8695 || MACH_RD88F5182

        help
          If you say Y here, the LEDs on your machine will be used
          to provide useful information about your current system status.
        help
          If you say Y here, the LEDs on your machine will be used
          to provide useful information about your current system status.


@@ -865,9 +920,16 @@ config KEXEC
          initially work for you.  It may help to enable device hotplugging
          support.
 
          initially work for you.  It may help to enable device hotplugging
          support.
 

+config ATAGS_PROC
+       bool "Export atags in procfs"
+       default n
+       help
+         Should the atags used to boot the kernel be exported in an "atags"
+         file in procfs. Useful with kexec.
+

 endmenu
 
 endmenu
 

-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX )
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)

 
 menu "CPU Frequency scaling"
 
 
 menu "CPU Frequency scaling"
 


@@ -903,6 +965,12 @@ config CPU_FREQ_IMX
 
          If in doubt, say N.
 
 
          If in doubt, say N.
 

+config CPU_FREQ_PXA
+       bool
+       depends on CPU_FREQ && ARCH_PXA && PXA25x
+       default y
+       select CPU_FREQ_DEFAULT_GOV_USERSPACE
+

 endmenu
 
 endif
 endmenu
 
 endif


@@ -951,7 +1019,7 @@ config FPE_FASTFPE
 
 config VFP
        bool "VFP-format floating point maths"
 
 config VFP
        bool "VFP-format floating point maths"

-       depends on CPU_V6 || CPU_ARM926T
+       depends on CPU_V6 || CPU_ARM926T || CPU_V7 || CPU_FEROCEON

        help
          Say Y to include VFP support code in the kernel. This is needed
          if your hardware includes a VFP unit.
        help
          Say Y to include VFP support code in the kernel. This is needed
          if your hardware includes a VFP unit.


@@ -961,6 +1029,18 @@ config VFP
 
          Say N if your target does not have VFP hardware.
 
 
          Say N if your target does not have VFP hardware.
 

+config VFPv3
+       bool
+       depends on VFP
+       default y if CPU_V7
+
+config NEON
+       bool "Advanced SIMD (NEON) Extension support"
+       depends on VFPv3 && CPU_V7
+       help
+         Say Y to include support code for NEON, the ARMv7 Advanced SIMD
+         Extension.
+

 endmenu
 
 menu "Userspace binary formats"
 endmenu
 
 menu "Userspace binary formats"


@@ -983,6 +1063,9 @@ menu "Power management options"
 
 source "kernel/power/Kconfig"
 
 
 source "kernel/power/Kconfig"
 

+config ARCH_SUSPEND_POSSIBLE
+       def_bool y
+

 endmenu
 
 source "net/Kconfig"
 endmenu
 
 source "net/Kconfig"


@@ -1040,6 +1123,8 @@ source "drivers/i2c/Kconfig"
 
 source "drivers/spi/Kconfig"
 
 
 source "drivers/spi/Kconfig"
 

+source "drivers/gpio/Kconfig"
+

 source "drivers/w1/Kconfig"
 
 source "drivers/power/Kconfig"
 source "drivers/w1/Kconfig"
 
 source "drivers/power/Kconfig"


@@ -1072,12 +1157,12 @@ source "drivers/rtc/Kconfig"
 
 source "drivers/dma/Kconfig"
 
 
 source "drivers/dma/Kconfig"
 

+source "drivers/dca/Kconfig"
+

 endmenu
 
 source "fs/Kconfig"
 
 endmenu
 
 source "fs/Kconfig"
 

-source "arch/arm/Kconfig.instrumentation"
-

 source "arch/arm/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/arm/Kconfig.debug"
 
 source "security/Kconfig"