Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / blackfin / Kconfig

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 79cfe26..ec44fc6 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -31,6 +31,7 @@ config BLACKFIN
        select HAVE_KERNEL_LZO if RAMKERNEL
        select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
+       select ARCH_HAVE_CUSTOM_GPIO_H
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_ATOMIC64
@@ -38,6 +39,7 @@ config BLACKFIN
        select IRQ_PER_CPU if SMP
        select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
        select GENERIC_SMP_IDLE_THREAD
+       select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
 
 config GENERIC_CSUM
        def_bool y
@@ -350,6 +352,11 @@ config MEM_MT48H32M16LFCJ_75
        depends on (BFIN526_EZBRD)
        default y
 
+config MEM_MT47H64M16
+       bool
+       depends on (BFIN609_EZKIT)
+       default y
+
 source "arch/blackfin/mach-bf518/Kconfig"
 source "arch/blackfin/mach-bf527/Kconfig"
 source "arch/blackfin/mach-bf533/Kconfig"
@@ -397,8 +404,9 @@ config ROM_BASE
        hex "Kernel ROM Base"
        depends on ROMKERNEL
        default "0x20040040"
-       range 0x20000000 0x20400000 if !(BF54x || BF561)
+       range 0x20000000 0x20400000 if !(BF54x || BF561 || BF60x)
        range 0x20000000 0x30000000 if (BF54x || BF561)
+       range 0xB0000000 0xC0000000 if (BF60x)
        help
          Make sure your ROM base does not include any file-header
          information that is prepended to the kernel.
@@ -642,9 +650,10 @@ comment "Kernel Timer/Scheduler"
 
 source kernel/Kconfig.hz
 
-config GENERIC_CLOCKEVENTS
+config SET_GENERIC_CLOCKEVENTS
        bool "Generic clock events"
        default y
+       select GENERIC_CLOCKEVENTS
 
 menu "Clock event device"
        depends on GENERIC_CLOCKEVENTS
@@ -678,12 +687,6 @@ config GPTMR0_CLOCKSOURCE
        depends on !TICKSOURCE_GPTMR0
 endmenu
 
-config ARCH_USES_GETTIMEOFFSET
-       depends on !GENERIC_CLOCKEVENTS
-       def_bool y
-
-source kernel/time/Kconfig
-
 comment "Misc"
 
 choice
@@ -999,19 +1002,15 @@ config BFIN_GPTIMERS
          To compile this driver as a module, choose M here: the module
          will be called gptimers.
 
-config HAVE_PWM
-       tristate "Enable PWM API support"
-       depends on BFIN_GPTIMERS
-       help
-         Enable support for the Pulse Width Modulation framework (as
-         found in linux/pwm.h).
-
-         To compile this driver as a module, choose M here: the module
-         will be called pwm.
-
 choice
        prompt "Uncached DMA region"
        default DMA_UNCACHED_1M
+config DMA_UNCACHED_32M
+       bool "Enable 32M DMA region"
+config DMA_UNCACHED_16M
+       bool "Enable 16M DMA region"
+config DMA_UNCACHED_8M
+       bool "Enable 8M DMA region"
 config DMA_UNCACHED_4M
        bool "Enable 4M DMA region"
 config DMA_UNCACHED_2M
@@ -1041,7 +1040,7 @@ config BFIN_EXTMEM_ICACHEABLE
 config BFIN_L2_ICACHEABLE
        bool "Enable ICACHE for L2 SRAM"
        depends on BFIN_ICACHE
-       depends on BF54x || BF561
+       depends on (BF54x || BF561 || BF60x) && !SMP
        default n
 
 config BFIN_DCACHE