Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

clocksource/drivers: Rename CLKSRC_OF to TIMER_OF

The config option name is now renamed to 'TIMER_OF' for consistency with
the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Daniel Lezcano 8 years ago
parent
2fcc112af3
commit
bb0eb050a5
18 changed files with 51 additions and 51 deletions
Unified View Show Diff Stats
  1. 5 5
      arch/arm/Kconfig
  2. 1 1
      arch/arm/mach-bcm/Kconfig
  3. 1 1
      arch/arm/mach-clps711x/Kconfig
  4. 1 1
      arch/arm/mach-s3c24xx/Kconfig
  5. 1 1
      arch/arm/mach-s3c64xx/Kconfig
  6. 2 2
      arch/arm64/Kconfig.platforms
  7. 1 1
      arch/h8300/Kconfig
  8. 1 1
      arch/microblaze/Kconfig
  9. 1 1
      arch/mips/ralink/Kconfig
  10. 1 1
      arch/nios2/Kconfig
  11. 1 1
      arch/sh/boards/Kconfig
  12. 30 30
      drivers/clocksource/Kconfig
  13. 1 1
      drivers/clocksource/Makefile
  14. 1 1
      drivers/clocksource/clps711x-timer.c
  15. 1 1
      drivers/clocksource/samsung_pwm_timer.c
  16. 0 0
      drivers/clocksource/timer-probe.c
  17. 1 1
      include/asm-generic/vmlinux.lds.h
  18. 1 1
      include/linux/clocksource.h

+ 5 - 5
arch/arm/Kconfig
View File 

@@ -337,7 +337,7 @@ config ARCH_MULTIPLATFORM
 
 	select ARM_HAS_SG_CHAIN
 
 	select ARM_HAS_SG_CHAIN
 
 	select ARM_PATCH_PHYS_VIRT
 
 	select ARM_PATCH_PHYS_VIRT
 
 	select AUTO_ZRELADDR
 
 	select AUTO_ZRELADDR
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select COMMON_CLK
 
 	select COMMON_CLK
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
 	select MIGHT_HAVE_PCI
 
 	select MIGHT_HAVE_PCI
 
@@ -351,7 +351,7 @@ config ARM_SINGLE_ARMV7M
 
 	depends on !MMU
 
 	depends on !MMU
 
 	select ARM_NVIC
 
 	select ARM_NVIC
 
 	select AUTO_ZRELADDR
 
 	select AUTO_ZRELADDR
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select COMMON_CLK
 
 	select COMMON_CLK
 
 	select CPU_V7M
 
 	select CPU_V7M
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
@@ -532,7 +532,7 @@ config ARCH_PXA
 
 	select CLKDEV_LOOKUP
 
 	select CLKDEV_LOOKUP
 
 	select CLKSRC_PXA
 
 	select CLKSRC_PXA
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CPU_XSCALE if !CPU_XSC3
 
 	select CPU_XSCALE if !CPU_XSC3
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
 	select GPIO_PXA
 
 	select GPIO_PXA
 
@@ -571,7 +571,7 @@ config ARCH_SA1100
 
 	select CLKDEV_LOOKUP
 
 	select CLKDEV_LOOKUP
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_PXA
 
 	select CLKSRC_PXA
 
-	select CLKSRC_OF if OF
 
+	select TIMER_OF if OF
 
 	select CPU_FREQ
 
 	select CPU_FREQ
 
 	select CPU_SA1100
 
 	select CPU_SA1100
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
@@ -1357,7 +1357,7 @@ config HAVE_ARM_ARCH_TIMER
 
 
 
 config HAVE_ARM_TWD
 
 config HAVE_ARM_TWD
 
 	bool
 
 	bool
 
-	select CLKSRC_OF if OF
 
+	select TIMER_OF if OF
 
 	help
 
 	help
 
 	  This options enables support for the ARM timer and watchdog unit
 
 	  This options enables support for the ARM timer and watchdog unit

+ 1 - 1
arch/arm/mach-bcm/Kconfig
View File 

@@ -150,7 +150,7 @@ config ARCH_BCM2835
 
 	select ARM_ERRATA_411920 if ARCH_MULTI_V6
 
 	select ARM_ERRATA_411920 if ARCH_MULTI_V6
 
 	select ARM_TIMER_SP804
 
 	select ARM_TIMER_SP804
 
 	select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
 
 	select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select BCM2835_TIMER
 
 	select BCM2835_TIMER
 
 	select PINCTRL
 
 	select PINCTRL
 
 	select PINCTRL_BCM2835
 
 	select PINCTRL_BCM2835

+ 1 - 1
arch/arm/mach-clps711x/Kconfig
View File 

@@ -2,7 +2,7 @@ menuconfig ARCH_CLPS711X
 
 	bool "Cirrus Logic EP721x/EP731x-based"
 
 	bool "Cirrus Logic EP721x/EP731x-based"
 
 	depends on ARCH_MULTI_V4T
 
 	depends on ARCH_MULTI_V4T
 
 	select AUTO_ZRELADDR
 
 	select AUTO_ZRELADDR
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CLPS711X_TIMER
 
 	select CLPS711X_TIMER
 
 	select COMMON_CLK
 
 	select COMMON_CLK
 
 	select CPU_ARM720T
 
 	select CPU_ARM720T

+ 1 - 1
arch/arm/mach-s3c24xx/Kconfig
View File 

@@ -394,7 +394,7 @@ config MACH_SMDK2416
 
 
 
 config MACH_S3C2416_DT
 
 config MACH_S3C2416_DT
 
 	bool "Samsung S3C2416 machine using devicetree"
 
 	bool "Samsung S3C2416 machine using devicetree"
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select USE_OF
 
 	select USE_OF
 
 	select PINCTRL
 
 	select PINCTRL
 
 	select PINCTRL_S3C24XX
 
 	select PINCTRL_S3C24XX

+ 1 - 1
arch/arm/mach-s3c64xx/Kconfig
View File 

@@ -336,7 +336,7 @@ config MACH_WLF_CRAGG_6410
 
 
 
 config MACH_S3C64XX_DT
 
 config MACH_S3C64XX_DT
 
 	bool "Samsung S3C6400/S3C6410 machine using Device Tree"
 
 	bool "Samsung S3C6400/S3C6410 machine using Device Tree"
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CPU_S3C6400
 
 	select CPU_S3C6400
 
 	select CPU_S3C6410
 
 	select CPU_S3C6410
 
 	select PINCTRL
 
 	select PINCTRL

+ 2 - 2
arch/arm64/Kconfig.platforms
View File 

@@ -18,7 +18,7 @@ config ARCH_ALPINE
 
 
 
 config ARCH_BCM2835
 
 config ARCH_BCM2835
 
 	bool "Broadcom BCM2835 family"
 
 	bool "Broadcom BCM2835 family"
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select GPIOLIB
 
 	select GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL
 
 	select PINCTRL_BCM2835
 
 	select PINCTRL_BCM2835
 
@@ -178,7 +178,7 @@ config ARCH_TEGRA
 
 	select ARCH_HAS_RESET_CONTROLLER
 
 	select ARCH_HAS_RESET_CONTROLLER
 
 	select CLKDEV_LOOKUP
 
 	select CLKDEV_LOOKUP
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
 	select GPIOLIB
 
 	select GPIOLIB
 
 	select PINCTRL
 
 	select PINCTRL

+ 1 - 1
arch/h8300/Kconfig
View File 

@@ -15,7 +15,7 @@ config H8300
 
 	select OF_IRQ
 
 	select OF_IRQ
 
 	select OF_EARLY_FLATTREE
 
 	select OF_EARLY_FLATTREE
 
 	select HAVE_MEMBLOCK
 
 	select HAVE_MEMBLOCK
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select H8300_TMR8
 
 	select H8300_TMR8
 
 	select HAVE_KERNEL_GZIP
 
 	select HAVE_KERNEL_GZIP
 
 	select HAVE_KERNEL_LZO
 
 	select HAVE_KERNEL_LZO

+ 1 - 1
arch/microblaze/Kconfig
View File 

@@ -4,7 +4,7 @@ config MICROBLAZE
 
 	select ARCH_MIGHT_HAVE_PC_PARPORT
 
 	select ARCH_MIGHT_HAVE_PC_PARPORT
 
 	select ARCH_WANT_IPC_PARSE_VERSION
 
 	select ARCH_WANT_IPC_PARSE_VERSION
 
 	select BUILDTIME_EXTABLE_SORT
 
 	select BUILDTIME_EXTABLE_SORT
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CLONE_BACKWARDS3
 
 	select CLONE_BACKWARDS3
 
 	select COMMON_CLK
 
 	select COMMON_CLK
 
 	select GENERIC_ATOMIC64
 
 	select GENERIC_ATOMIC64

+ 1 - 1
arch/mips/ralink/Kconfig
View File 

@@ -4,7 +4,7 @@ config CLKEVT_RT3352
 
 	bool
 
 	bool
 
 	depends on SOC_RT305X || SOC_MT7620
 
 	depends on SOC_RT305X || SOC_MT7620
 
 	default y
 
 	default y
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 
 
 config RALINK_ILL_ACC
 
 config RALINK_ILL_ACC

+ 1 - 1
arch/nios2/Kconfig
View File 

@@ -1,6 +1,6 @@
 
 config NIOS2
 
 config NIOS2
 
 	def_bool y
 
 	def_bool y
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select GENERIC_ATOMIC64
 
 	select GENERIC_ATOMIC64
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CPU_DEVICES
 
 	select GENERIC_CPU_DEVICES

+ 1 - 1
arch/sh/boards/Kconfig
View File 

@@ -10,7 +10,7 @@ config SH_DEVICE_TREE
 
 	bool "Board Described by Device Tree"
 
 	bool "Board Described by Device Tree"
 
 	select OF
 
 	select OF
 
 	select OF_EARLY_FLATTREE
 
 	select OF_EARLY_FLATTREE
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select COMMON_CLK
 
 	select COMMON_CLK
 
 	select GENERIC_CALIBRATE_DELAY
 
 	select GENERIC_CALIBRATE_DELAY
 
 	help
 
 	help

+ 30 - 30
drivers/clocksource/Kconfig
View File 

@@ -1,15 +1,15 @@
 
 menu "Clock Source drivers"
 
 menu "Clock Source drivers"
 
 	depends on !ARCH_USES_GETTIMEOFFSET
 
 	depends on !ARCH_USES_GETTIMEOFFSET
 
 
 
-config CLKSRC_OF
 
+config TIMER_OF
 
 	bool
 
 	bool
 
-	select CLKSRC_PROBE
 
+	select TIMER_PROBE
 
 
 
 config CLKSRC_ACPI
 
 config CLKSRC_ACPI
 
 	bool
 
 	bool
 
-	select CLKSRC_PROBE
 
+	select TIMER_PROBE
 
 
 
-config CLKSRC_PROBE
 
+config TIMER_PROBE
 
 	bool
 
 	bool
 
 
 
 config CLKSRC_I8253
 
 config CLKSRC_I8253
 
@@ -58,14 +58,14 @@ config DW_APB_TIMER
 
 config DW_APB_TIMER_OF
 
 config DW_APB_TIMER_OF
 
 	bool
 
 	bool
 
 	select DW_APB_TIMER
 
 	select DW_APB_TIMER
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 
 
 config FTTMR010_TIMER
 
 config FTTMR010_TIMER
 
 	bool "Faraday Technology timer driver" if COMPILE_TEST
 
 	bool "Faraday Technology timer driver" if COMPILE_TEST
 
 	depends on GENERIC_CLOCKEVENTS
 
 	depends on GENERIC_CLOCKEVENTS
 
 	depends on HAS_IOMEM
 
 	depends on HAS_IOMEM
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select MFD_SYSCON
 
 	select MFD_SYSCON
 
 	help
 
 	help
 
 	  Enables support for the Faraday Technology timer block
 
 	  Enables support for the Faraday Technology timer block
 
@@ -74,7 +74,7 @@ config FTTMR010_TIMER
 
 config ROCKCHIP_TIMER
 
 config ROCKCHIP_TIMER
 
 	bool "Rockchip timer driver" if COMPILE_TEST
 
 	bool "Rockchip timer driver" if COMPILE_TEST
 
 	depends on ARM || ARM64
 
 	depends on ARM || ARM64
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 	help
 
 	help
 
 	  Enables the support for the rockchip timer driver.
 
 	  Enables the support for the rockchip timer driver.
 
@@ -82,7 +82,7 @@ config ROCKCHIP_TIMER
 
 config ARMADA_370_XP_TIMER
 
 config ARMADA_370_XP_TIMER
 
 	bool "Armada 370 and XP timer driver" if COMPILE_TEST
 
 	bool "Armada 370 and XP timer driver" if COMPILE_TEST
 
 	depends on ARM
 
 	depends on ARM
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 	help
 
 	help
 
 	  Enables the support for the Armada 370 and XP timer driver.
 
 	  Enables the support for the Armada 370 and XP timer driver.
 
@@ -97,7 +97,7 @@ config MESON6_TIMER
 
 config ORION_TIMER
 
 config ORION_TIMER
 
 	bool "Orion timer driver" if COMPILE_TEST
 
 	bool "Orion timer driver" if COMPILE_TEST
 
 	depends on ARM
 
 	depends on ARM
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 	help
 
 	help
 
 	  Enables the support for the Orion timer driver
 
 	  Enables the support for the Orion timer driver
 
@@ -141,7 +141,7 @@ config ASM9260_TIMER
 
 	bool "ASM9260 timer driver" if COMPILE_TEST
 
 	bool "ASM9260 timer driver" if COMPILE_TEST
 
 	depends on GENERIC_CLOCKEVENTS
 
 	depends on GENERIC_CLOCKEVENTS
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	help
 
 	help
 
 	  Enables support for the ASM9260 timer.
 
 	  Enables support for the ASM9260 timer.
 
 
 
@@ -247,21 +247,21 @@ config CLKSRC_LPC32XX
 
 	depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
 
 	depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
 
 	depends on ARM
 
 	depends on ARM
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	help
 
 	help
 
 	  Support for the LPC32XX clocksource.
 
 	  Support for the LPC32XX clocksource.
 
 
 
 config CLKSRC_PISTACHIO
 
 config CLKSRC_PISTACHIO
 
 	bool "Clocksource for Pistachio SoC" if COMPILE_TEST
 
 	bool "Clocksource for Pistachio SoC" if COMPILE_TEST
 
 	depends on HAS_IOMEM
 
 	depends on HAS_IOMEM
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	help
 
 	help
 
 	  Enables the clocksource for the Pistachio SoC.
 
 	  Enables the clocksource for the Pistachio SoC.
 
 
 
 config CLKSRC_TI_32K
 
 config CLKSRC_TI_32K
 
 	bool "Texas Instruments 32.768 Hz Clocksource" if COMPILE_TEST
 
 	bool "Texas Instruments 32.768 Hz Clocksource" if COMPILE_TEST
 
 	depends on GENERIC_SCHED_CLOCK
 
 	depends on GENERIC_SCHED_CLOCK
 
-	select CLKSRC_OF if OF
 
+	select TIMER_OF if OF
 
 	help
 
 	help
 
 	  This option enables support for Texas Instruments 32.768 Hz clocksource
 
 	  This option enables support for Texas Instruments 32.768 Hz clocksource
 
 	  available on many OMAP-like platforms.
 
 	  available on many OMAP-like platforms.
 
@@ -270,7 +270,7 @@ config CLKSRC_NPS
 
 	bool "NPS400 clocksource driver" if COMPILE_TEST
 
 	bool "NPS400 clocksource driver" if COMPILE_TEST
 
 	depends on !PHYS_ADDR_T_64BIT
 
 	depends on !PHYS_ADDR_T_64BIT
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
-	select CLKSRC_OF if OF
 
+	select TIMER_OF if OF
 
 	help
 
 	help
 
 	  NPS400 clocksource support.
 
 	  NPS400 clocksource support.
 
 	  Got 64 bit counter with update rate up to 1000MHz.
 
 	  Got 64 bit counter with update rate up to 1000MHz.
 
@@ -285,12 +285,12 @@ config CLKSRC_MPS2
 
 	bool "Clocksource for MPS2 SoCs" if COMPILE_TEST
 
 	bool "Clocksource for MPS2 SoCs" if COMPILE_TEST
 
 	depends on GENERIC_SCHED_CLOCK
 
 	depends on GENERIC_SCHED_CLOCK
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 
 
 config ARC_TIMERS
 
 config ARC_TIMERS
 
 	bool "Support for 32-bit TIMERn counters in ARC Cores" if COMPILE_TEST
 
 	bool "Support for 32-bit TIMERn counters in ARC Cores" if COMPILE_TEST
 
 	depends on GENERIC_CLOCKEVENTS
 
 	depends on GENERIC_CLOCKEVENTS
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	help
 
 	help
 
 	  These are legacy 32-bit TIMER0 and TIMER1 counters found on all ARC cores
 
 	  These are legacy 32-bit TIMER0 and TIMER1 counters found on all ARC cores
 
 	  (ARC700 as well as ARC HS38).
 
 	  (ARC700 as well as ARC HS38).
 
@@ -300,7 +300,7 @@ config ARC_TIMERS_64BIT
 
 	bool "Support for 64-bit counters in ARC HS38 cores" if COMPILE_TEST
 
 	bool "Support for 64-bit counters in ARC HS38 cores" if COMPILE_TEST
 
 	depends on GENERIC_CLOCKEVENTS
 
 	depends on GENERIC_CLOCKEVENTS
 
 	depends on ARC_TIMERS
 
 	depends on ARC_TIMERS
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	help
 
 	help
 
 	  This enables 2 different 64-bit timers: RTC (for UP) and GFRC (for SMP)
 
 	  This enables 2 different 64-bit timers: RTC (for UP) and GFRC (for SMP)
 
 	  RTC is implemented inside the core, while GFRC sits outside the core in
 
 	  RTC is implemented inside the core, while GFRC sits outside the core in
 
@@ -309,7 +309,7 @@ config ARC_TIMERS_64BIT
 
 
 
 config ARM_ARCH_TIMER
 
 config ARM_ARCH_TIMER
 
 	bool
 
 	bool
 
-	select CLKSRC_OF if OF
 
+	select TIMER_OF if OF
 
 	select CLKSRC_ACPI if ACPI
 
 	select CLKSRC_ACPI if ACPI
 
 
 
 config ARM_ARCH_TIMER_EVTSTREAM
 
 config ARM_ARCH_TIMER_EVTSTREAM
 
@@ -367,7 +367,7 @@ config ARM64_ERRATUM_858921
 
 
 
 config ARM_GLOBAL_TIMER
 
 config ARM_GLOBAL_TIMER
 
 	bool "Support for the ARM global timer" if COMPILE_TEST
 
 	bool "Support for the ARM global timer" if COMPILE_TEST
 
-	select CLKSRC_OF if OF
 
+	select TIMER_OF if OF
 
 	depends on ARM
 
 	depends on ARM
 
 	help
 
 	help
 
 	  This options enables support for the ARM global timer unit
 
 	  This options enables support for the ARM global timer unit
 
@@ -376,7 +376,7 @@ config ARM_TIMER_SP804
 
 	bool "Support for Dual Timer SP804 module"
 
 	bool "Support for Dual Timer SP804 module"
 
 	depends on GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP
 
 	depends on GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
-	select CLKSRC_OF if OF
 
+	select TIMER_OF if OF
 
 
 
 config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 
 config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 
 	bool
 
 	bool
 
@@ -387,19 +387,19 @@ config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 
 
 
 config ARMV7M_SYSTICK
 
 config ARMV7M_SYSTICK
 
 	bool "Support for the ARMv7M system time" if COMPILE_TEST
 
 	bool "Support for the ARMv7M system time" if COMPILE_TEST
 
-	select CLKSRC_OF if OF
 
+	select TIMER_OF if OF
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 	help
 
 	help
 
 	  This options enables support for the ARMv7M system timer unit
 
 	  This options enables support for the ARMv7M system timer unit
 
 
 
 config ATMEL_PIT
 
 config ATMEL_PIT
 
-	select CLKSRC_OF if OF
 
+	select TIMER_OF if OF
 
 	def_bool SOC_AT91SAM9 || SOC_SAMA5
 
 	def_bool SOC_AT91SAM9 || SOC_SAMA5
 
 
 
 config ATMEL_ST
 
 config ATMEL_ST
 
 	bool "Atmel ST timer support" if COMPILE_TEST
 
 	bool "Atmel ST timer support" if COMPILE_TEST
 
 	depends on GENERIC_CLOCKEVENTS
 
 	depends on GENERIC_CLOCKEVENTS
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select MFD_SYSCON
 
 	select MFD_SYSCON
 
 	help
 
 	help
 
 	  Support for the Atmel ST timer.
 
 	  Support for the Atmel ST timer.
 
@@ -442,7 +442,7 @@ config VF_PIT_TIMER
 
 config OXNAS_RPS_TIMER
 
 config OXNAS_RPS_TIMER
 
 	bool "Oxford Semiconductor OXNAS RPS Timers driver" if COMPILE_TEST
 
 	bool "Oxford Semiconductor OXNAS RPS Timers driver" if COMPILE_TEST
 
 	depends on GENERIC_CLOCKEVENTS
 
 	depends on GENERIC_CLOCKEVENTS
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 	help
 
 	help
 
 	  This enables support for the Oxford Semiconductor OXNAS RPS timers.
 
 	  This enables support for the Oxford Semiconductor OXNAS RPS timers.
 
@@ -453,7 +453,7 @@ config SYS_SUPPORTS_SH_CMT
 
 config MTK_TIMER
 
 config MTK_TIMER
 
 	bool "Mediatek timer driver" if COMPILE_TEST
 
 	bool "Mediatek timer driver" if COMPILE_TEST
 
 	depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
 
 	depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 	help
 
 	help
 
 	  Support for Mediatek timer driver.
 
 	  Support for Mediatek timer driver.
 
@@ -526,7 +526,7 @@ config EM_TIMER_STI
 
 config CLKSRC_QCOM
 
 config CLKSRC_QCOM
 
 	bool "Qualcomm MSM timer" if COMPILE_TEST
 
 	bool "Qualcomm MSM timer" if COMPILE_TEST
 
 	depends on ARM
 
 	depends on ARM
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	help
 
 	help
 
 	  This enables the clocksource and the per CPU clockevent driver for the
 
 	  This enables the clocksource and the per CPU clockevent driver for the
 
 	  Qualcomm SoCs.
 
 	  Qualcomm SoCs.
 
@@ -534,7 +534,7 @@ config CLKSRC_QCOM
 
 config CLKSRC_VERSATILE
 
 config CLKSRC_VERSATILE
 
 	bool "ARM Versatile (Express) reference platforms clock source" if COMPILE_TEST
 
 	bool "ARM Versatile (Express) reference platforms clock source" if COMPILE_TEST
 
 	depends on GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET
 
 	depends on GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	default y if MFD_VEXPRESS_SYSREG
 
 	default y if MFD_VEXPRESS_SYSREG
 
 	help
 
 	help
 
 	  This option enables clock source based on free running
 
 	  This option enables clock source based on free running
 
@@ -545,12 +545,12 @@ config CLKSRC_VERSATILE
 
 config CLKSRC_MIPS_GIC
 
 config CLKSRC_MIPS_GIC
 
 	bool
 
 	bool
 
 	depends on MIPS_GIC
 
 	depends on MIPS_GIC
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 
 
 config CLKSRC_TANGO_XTAL
 
 config CLKSRC_TANGO_XTAL
 
 	bool "Clocksource for Tango SoC" if COMPILE_TEST
 
 	bool "Clocksource for Tango SoC" if COMPILE_TEST
 
 	depends on ARM
 
 	depends on ARM
 
-	select CLKSRC_OF
 
+	select TIMER_OF
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 	help
 
 	help
 
 	  This enables the clocksource for Tango SoC
 
 	  This enables the clocksource for Tango SoC
 
@@ -591,7 +591,7 @@ config CLKSRC_IMX_GPT
 
 
 
 config CLKSRC_ST_LPC
 
 config CLKSRC_ST_LPC
 
 	bool "Low power clocksource found in the LPC" if COMPILE_TEST
 
 	bool "Low power clocksource found in the LPC" if COMPILE_TEST
 
-	select CLKSRC_OF if OF
 
+	select TIMER_OF if OF
 
 	depends on HAS_IOMEM
 
 	depends on HAS_IOMEM
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 	help
 
 	help

+ 1 - 1
drivers/clocksource/Makefile
View File 

@@ -1,4 +1,4 @@
 
-obj-$(CONFIG_CLKSRC_PROBE)	+= clksrc-probe.o
 
+obj-$(CONFIG_TIMER_PROBE)	+= timer-probe.o
 
 obj-$(CONFIG_ATMEL_PIT)		+= timer-atmel-pit.o
 
 obj-$(CONFIG_ATMEL_PIT)		+= timer-atmel-pit.o
 
 obj-$(CONFIG_ATMEL_ST)		+= timer-atmel-st.o
 
 obj-$(CONFIG_ATMEL_ST)		+= timer-atmel-st.o
 
 obj-$(CONFIG_ATMEL_TCB_CLKSRC)	+= tcb_clksrc.o
 
 obj-$(CONFIG_ATMEL_TCB_CLKSRC)	+= tcb_clksrc.o

+ 1 - 1
drivers/clocksource/clps711x-timer.c
View File 

@@ -103,7 +103,7 @@ void __init clps711x_clksrc_init(void __iomem *tc1_base, void __iomem *tc2_base,
 
 	BUG_ON(_clps711x_clkevt_init(tc2, tc2_base, irq));
 
 	BUG_ON(_clps711x_clkevt_init(tc2, tc2_base, irq));
 
 }
 
 }
 
 
 
-#ifdef CONFIG_CLKSRC_OF
 
+#ifdef CONFIG_TIMER_OF
 
 static int __init clps711x_timer_init(struct device_node *np)
 
 static int __init clps711x_timer_init(struct device_node *np)
 
 {
 
 {
 
 	unsigned int irq = irq_of_parse_and_map(np, 0);
 
 	unsigned int irq = irq_of_parse_and_map(np, 0);

+ 1 - 1
drivers/clocksource/samsung_pwm_timer.c
View File 

@@ -418,7 +418,7 @@ void __init samsung_pwm_clocksource_init(void __iomem *base,
 
 	_samsung_pwm_clocksource_init();
 
 	_samsung_pwm_clocksource_init();
 
 }
 
 }
 
 
 
-#ifdef CONFIG_CLKSRC_OF
 
+#ifdef CONFIG_TIMER_OF
 
 static int __init samsung_pwm_alloc(struct device_node *np,
 
 static int __init samsung_pwm_alloc(struct device_node *np,
 
 				    const struct samsung_pwm_variant *variant)
 
 				    const struct samsung_pwm_variant *variant)
 
 {
 
 {

+ 0 - 0
drivers/clocksource/clksrc-probe.c → drivers/clocksource/timer-probe.c
View File


+ 1 - 1
include/asm-generic/vmlinux.lds.h
View File 

@@ -172,7 +172,7 @@
 
 	KEEP(*(__##name##_of_table))					\
 
 	KEEP(*(__##name##_of_table))					\
 
 	KEEP(*(__##name##_of_table_end))
 
 	KEEP(*(__##name##_of_table_end))
 
 
 
-#define TIMER_OF_TABLES()	OF_TABLE(CONFIG_CLKSRC_OF, timer)
 
+#define TIMER_OF_TABLES()	OF_TABLE(CONFIG_TIMER_OF, timer)
 
 #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)
 
 #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)
 
 #define CLK_OF_TABLES()		OF_TABLE(CONFIG_COMMON_CLK, clk)
 
 #define CLK_OF_TABLES()		OF_TABLE(CONFIG_COMMON_CLK, clk)
 
 #define IOMMU_OF_TABLES()	OF_TABLE(CONFIG_OF_IOMMU, iommu)
 
 #define IOMMU_OF_TABLES()	OF_TABLE(CONFIG_OF_IOMMU, iommu)

+ 1 - 1
include/linux/clocksource.h
View File 

@@ -252,7 +252,7 @@ extern int clocksource_i8253_init(void);
 
 #define TIMER_OF_DECLARE(name, compat, fn) \
 
 #define TIMER_OF_DECLARE(name, compat, fn) \
 
 	OF_DECLARE_1_RET(timer, name, compat, fn)
 
 	OF_DECLARE_1_RET(timer, name, compat, fn)
 
 
 
-#ifdef CONFIG_CLKSRC_PROBE
 
+#ifdef CONFIG_TIMER_PROBE
 
 extern void timer_probe(void);
 
 extern void timer_probe(void);
 
 #else
 
 #else
 
 static inline void timer_probe(void) {}
 
 static inline void timer_probe(void) {}