diff options
| author | Rob Herring <r.herring@freescale.com> | 2009-10-19 14:43:19 -0500 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2010-03-25 13:59:52 -0400 |
| commit | 71bde5760fb31fb4a2cc4a57a3366b2f5a42cb90 (patch) | |
| tree | 5690552665f0b7843e6552e4d5fe7b63cbc78f51 /arch/arm/Kconfig | |
| parent | 585e8cb92b96cb7212976468bee5e57e4a53271f (diff) | |
ENGR00117389 Port 5.0.0 release to 2.6.31
This is i.MX BSP 5.0.0 release ported to 2.6.31
Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Alan Tull <r80115@freescale.com>
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 00eb350ef811..954e50bf91c5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -294,7 +294,8 @@ config ARCH_MXC select ARCH_MTD_XIP select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB - select HAVE_CLK +# select HAVE_CLK + select ZONE_DMA help Support for Freescale MXC/iMX-based family of processors @@ -308,6 +309,7 @@ config ARCH_STMP3XXX select GENERIC_CLOCKEVENTS select GENERIC_GPIO select USB_ARCH_HAS_EHCI + select ZONE_DMA help Support for systems based on the Freescale 3xxx CPUs. @@ -1077,7 +1079,7 @@ config LEDS ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ ARCH_AT91 || ARCH_DAVINCI || \ - ARCH_KS8695 || MACH_RD88F5182 || ARCH_REALVIEW + ARCH_KS8695 || MACH_RD88F5182 || ARCH_REALVIEW || ARCH_MXC help If you say Y here, the LEDs on your machine will be used to provide useful information about your current system status. @@ -1254,7 +1256,7 @@ endmenu menu "CPU Power Management" -if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_PXA || ARCH_S3C64XX) +if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_PXA || ARCH_S3C64XX || ARCH_MXC || ARCH_STMP3XXX) source "drivers/cpufreq/Kconfig" @@ -1289,6 +1291,12 @@ config CPU_FREQ_S3C64XX bool "CPUfreq support for Samsung S3C64XX CPUs" depends on CPU_FREQ && CPU_S3C6410 +config CPU_FREQ_IMX + tristate "CPUfreq driver for i.MX CPUs" + depends on ARCH_MXC && CPU_FREQ && REGULATOR + help + This enables the CPUfreq driver for i.MX CPUs. + endif source "drivers/cpuidle/Kconfig" @@ -1436,6 +1444,8 @@ source "drivers/char/Kconfig" source "drivers/i2c/Kconfig" +source "drivers/i2c-slave/Kconfig" + source "drivers/spi/Kconfig" source "drivers/gpio/Kconfig" @@ -1490,6 +1500,10 @@ source "drivers/uio/Kconfig" source "drivers/staging/Kconfig" +if ARCH_MXC +source "drivers/mxc/Kconfig" +endif + endmenu source "fs/Kconfig" |