diff options
author | Heiko Stuebner <heiko@sntech.de> | 2013-06-04 05:38:11 -0400 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2013-06-12 07:47:30 -0400 |
commit | 1b4eca0f634be2a99f2baa6c29dfd183590ead3f (patch) | |
tree | c8fba1dcd5a761bfe4e5fc6206ecc0ca7f11c987 | |
parent | a8b447f2bbbba737ff4478f498d7f83c75a9461b (diff) |
clocksource: dw_apb_timer_of: select DW_APB_TIMER
dw_apb_timer_of is the driver part facing devicetree platforms and
calls into dw_apb_timer with the data gathered from the dt.
Currently the two platforms using the dw_apb_timer_of select both
the options for the core timer and the dt addon.
As dw_apb_timer_of always depends on dw_apb_timer let it select
DW_APB_TIMER itself without the need for every platform to do it.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: Dinh Nguyen <dinguyen@altera.com>
-rw-r--r-- | arch/arm/mach-picoxcell/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/Kconfig | 1 | ||||
-rw-r--r-- | drivers/clocksource/Kconfig | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-picoxcell/Kconfig b/arch/arm/mach-picoxcell/Kconfig index 13bae78b215a..b1022f4315f7 100644 --- a/arch/arm/mach-picoxcell/Kconfig +++ b/arch/arm/mach-picoxcell/Kconfig | |||
@@ -4,7 +4,6 @@ config ARCH_PICOXCELL | |||
4 | select ARM_PATCH_PHYS_VIRT | 4 | select ARM_PATCH_PHYS_VIRT |
5 | select ARM_VIC | 5 | select ARM_VIC |
6 | select CPU_V6K | 6 | select CPU_V6K |
7 | select DW_APB_TIMER | ||
8 | select DW_APB_TIMER_OF | 7 | select DW_APB_TIMER_OF |
9 | select GENERIC_CLOCKEVENTS | 8 | select GENERIC_CLOCKEVENTS |
10 | select HAVE_TCM | 9 | select HAVE_TCM |
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index 566e804d4036..a279fb315069 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig | |||
@@ -7,7 +7,6 @@ config ARCH_SOCFPGA | |||
7 | select CLKDEV_LOOKUP | 7 | select CLKDEV_LOOKUP |
8 | select COMMON_CLK | 8 | select COMMON_CLK |
9 | select CPU_V7 | 9 | select CPU_V7 |
10 | select DW_APB_TIMER | ||
11 | select DW_APB_TIMER_OF | 10 | select DW_APB_TIMER_OF |
12 | select GENERIC_CLOCKEVENTS | 11 | select GENERIC_CLOCKEVENTS |
13 | select GPIO_PL061 if GPIOLIB | 12 | select GPIO_PL061 if GPIOLIB |
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index f151c6cf27c3..48a0f2e1dd78 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig | |||
@@ -21,6 +21,7 @@ config DW_APB_TIMER | |||
21 | 21 | ||
22 | config DW_APB_TIMER_OF | 22 | config DW_APB_TIMER_OF |
23 | bool | 23 | bool |
24 | select DW_APB_TIMER | ||
24 | 25 | ||
25 | config ARMADA_370_XP_TIMER | 26 | config ARMADA_370_XP_TIMER |
26 | bool | 27 | bool |