Skip to content

Commit ab0bbef

Browse files
tmlinddlezcano
authored andcommitted
clocksource/drivers/timer-ti-dm: Make timer selectable for ARCH_K3
Let's make timer-ti-dm selectable for ARCH_K3, and add a separate option for OMAP_DM_SYSTIMER as there should be no need for it on ARCH_K3. For older TI SoCs, we are already selecting OMAP_DM_TIMER in arch/arm/mach-omap*/Kconfig. For mach-omap2, we need to now also select OMAP_DM_SYSTIMER. Cc: Keerthy <[email protected]> Cc: Nishanth Menon <[email protected]> Cc: Vignesh Raghavendra <[email protected]> Signed-off-by: Tony Lindgren <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Daniel Lezcano <[email protected]>
1 parent 41e79b1 commit ab0bbef

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

arch/arm/mach-omap2/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ config ARCH_OMAP2PLUS
105105
select MACH_OMAP_GENERIC
106106
select MEMORY
107107
select MFD_SYSCON
108+
select OMAP_DM_SYSTIMER
108109
select OMAP_DM_TIMER
109110
select OMAP_GPMC
110111
select PINCTRL
@@ -160,6 +161,7 @@ config SOC_OMAP2420
160161
bool "OMAP2420 support"
161162
depends on ARCH_OMAP2
162163
default y
164+
select OMAP_DM_SYSTIMER
163165
select OMAP_DM_TIMER
164166
select SOC_HAS_OMAP2_SDRC
165167

drivers/clocksource/Kconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ config CLKEVT_I8253
2222
config I8253_LOCK
2323
bool
2424

25-
config OMAP_DM_TIMER
25+
config OMAP_DM_SYSTIMER
2626
bool
2727
select TIMER_OF
2828

@@ -56,6 +56,12 @@ config DIGICOLOR_TIMER
5656
help
5757
Enables the support for the digicolor timer driver.
5858

59+
config OMAP_DM_TIMER
60+
tristate "OMAP dual-mode timer driver" if ARCH_K3 || COMPILE_TEST
61+
select TIMER_OF
62+
help
63+
Enables the support for the TI dual-mode timer driver.
64+
5965
config DW_APB_TIMER
6066
bool "DW APB timer driver" if COMPILE_TEST
6167
help

drivers/clocksource/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ obj-$(CONFIG_CLKSRC_MMIO) += mmio.o
1818
obj-$(CONFIG_DAVINCI_TIMER) += timer-davinci.o
1919
obj-$(CONFIG_DIGICOLOR_TIMER) += timer-digicolor.o
2020
obj-$(CONFIG_OMAP_DM_TIMER) += timer-ti-dm.o
21-
obj-$(CONFIG_OMAP_DM_TIMER) += timer-ti-dm-systimer.o
21+
obj-$(CONFIG_OMAP_DM_SYSTIMER) += timer-ti-dm-systimer.o
2222
obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o
2323
obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o
2424
obj-$(CONFIG_FTTMR010_TIMER) += timer-fttmr010.o

0 commit comments

Comments
 (0)