Merge tag 'clksrc-cleanup-for-3.10-part2' of git://sources.calxeda.com/kernel/linux...

[karo-tx-linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 13b739469c515cb93a8dff1cdf686583a3941c54..1571a4150439c4e64294b876ba57cea3fbc1c24e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -673,6 +673,7 @@ config ARCH_TEGRA
        select HAVE_CLK
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
        select HAVE_CLK
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0

+       select SOC_BUS

        select SPARSE_IRQ
        select USE_OF
        help
        select SPARSE_IRQ
        select USE_OF
        help


@@ -769,12 +770,15 @@ config ARCH_SA1100
 config ARCH_S3C24XX
        bool "Samsung S3C24XX SoCs"
        select ARCH_HAS_CPUFREQ
 config ARCH_S3C24XX
        bool "Samsung S3C24XX SoCs"
        select ARCH_HAS_CPUFREQ

-       select ARCH_USES_GETTIMEOFFSET

        select CLKDEV_LOOKUP
        select CLKDEV_LOOKUP

+       select CLKSRC_MMIO
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_GPIO

        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select HAVE_S3C_RTC if RTC_CLASS
        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select HAVE_S3C_RTC if RTC_CLASS

+       select MULTI_IRQ_HANDLER

        select NEED_MACH_GPIO_H
        select NEED_MACH_IO_H
        help
        select NEED_MACH_GPIO_H
        select NEED_MACH_IO_H
        help


@@ -787,10 +791,11 @@ config ARCH_S3C64XX
        bool "Samsung S3C64XX"
        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        bool "Samsung S3C64XX"
        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB

-       select ARCH_USES_GETTIMEOFFSET

        select ARM_VIC
        select CLKDEV_LOOKUP
        select ARM_VIC
        select CLKDEV_LOOKUP

+       select CLKSRC_MMIO

        select CPU_V6
        select CPU_V6

+       select GENERIC_CLOCKEVENTS

        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG


@@ -824,9 +829,11 @@ config ARCH_S5P64X0
 
 config ARCH_S5PC100
        bool "Samsung S5PC100"
 
 config ARCH_S5PC100
        bool "Samsung S5PC100"

-       select ARCH_USES_GETTIMEOFFSET

        select CLKDEV_LOOKUP
        select CLKDEV_LOOKUP

+       select CLKSRC_MMIO

        select CPU_V7
        select CPU_V7

+       select GENERIC_CLOCKEVENTS
+       select GENERIC_GPIO

        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG


@@ -1173,6 +1180,7 @@ config PLAT_VERSATILE
 config ARM_TIMER_SP804
        bool
        select CLKSRC_MMIO
 config ARM_TIMER_SP804
        bool
        select CLKSRC_MMIO

+       select CLKSRC_OF if OF

        select HAVE_SCHED_CLOCK
 
 source arch/arm/mm/Kconfig
        select HAVE_SCHED_CLOCK
 
 source arch/arm/mm/Kconfig


@@ -1593,6 +1601,7 @@ config HAVE_ARM_ARCH_TIMER
 config HAVE_ARM_TWD
        bool
        depends on SMP
 config HAVE_ARM_TWD
        bool
        depends on SMP

+       select CLKSRC_OF if OF

        help
          This options enables support for the ARM timer and watchdog unit
 
        help
          This options enables support for the ARM timer and watchdog unit
 


@@ -1646,7 +1655,7 @@ config LOCAL_TIMERS
        bool "Use local timer interrupts"
        depends on SMP
        default y
        bool "Use local timer interrupts"
        depends on SMP
        default y

-       select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !EXYNOS4_MCT)
+       select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !CLKSRC_EXYNOS_MCT)

        help
          Enable support for local timers on SMP platforms, rather then the
          legacy IPI broadcast method.  Local timers allows the system
        help
          Enable support for local timers on SMP platforms, rather then the
          legacy IPI broadcast method.  Local timers allows the system


@@ -1661,7 +1670,8 @@ config ARCH_NR_GPIO
        default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
        default 512 if SOC_OMAP5
        default 355 if ARCH_U8500
        default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
        default 512 if SOC_OMAP5
        default 355 if ARCH_U8500

-       default 288 if ARCH_VT8500 || ARCH_SUNXI
+       default 352 if ARCH_VT8500
+       default 288 if ARCH_SUNXI

        default 264 if MACH_H4700
        default 0
        help
        default 264 if MACH_H4700
        default 0
        help