| Message ID | 20220408101715.43697-3-tony@atomide.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | TI timer changes for am6 | expand |
On 08/04/2022 12:17, Tony Lindgren wrote: > 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 <j-keerthy@ti.com> > Cc: Nishanth Menon <nm@ti.com> > Cc: Vignesh Raghavendra <vigneshr@ti.com> > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > arch/arm/mach-omap2/Kconfig | 2 ++ > drivers/clocksource/Kconfig | 8 +++++++- > drivers/clocksource/Makefile | 2 +- > 3 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig > --- a/arch/arm/mach-omap2/Kconfig > +++ b/arch/arm/mach-omap2/Kconfig > @@ -105,6 +105,7 @@ config ARCH_OMAP2PLUS > select MACH_OMAP_GENERIC > select MEMORY > select MFD_SYSCON > + select OMAP_DM_SYSTIMER > select OMAP_DM_TIMER > select OMAP_GPMC > select PINCTRL > @@ -160,6 +161,7 @@ config SOC_OMAP2420 > bool "OMAP2420 support" > depends on ARCH_OMAP2 > default y > + select OMAP_DM_SYSTIMER > select OMAP_DM_TIMER > select SOC_HAS_OMAP2_SDRC > > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > --- a/drivers/clocksource/Kconfig > +++ b/drivers/clocksource/Kconfig > @@ -22,7 +22,7 @@ config CLKEVT_I8253 > config I8253_LOCK > bool > > -config OMAP_DM_TIMER > +config OMAP_DM_SYSTIMER > bool > select TIMER_OF > > @@ -56,6 +56,12 @@ config DIGICOLOR_TIMER > help > Enables the support for the digicolor timer driver. > > +config OMAP_DM_TIMER > + tristate "OMAP dual-mode timer driver" if ARCH_K3 || COMPILE_TEST Actually, I missed this. Could you convert to a 'bool' there is no module in the timer drivers ATM. > + select TIMER_OF > + help > + Enables the support for the TI dual-mode timer driver. > + > config DW_APB_TIMER > bool "DW APB timer driver" if COMPILE_TEST > help > diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile > --- a/drivers/clocksource/Makefile > +++ b/drivers/clocksource/Makefile > @@ -18,7 +18,7 @@ obj-$(CONFIG_CLKSRC_MMIO) += mmio.o > obj-$(CONFIG_DAVINCI_TIMER) += timer-davinci.o > obj-$(CONFIG_DIGICOLOR_TIMER) += timer-digicolor.o > obj-$(CONFIG_OMAP_DM_TIMER) += timer-ti-dm.o > -obj-$(CONFIG_OMAP_DM_TIMER) += timer-ti-dm-systimer.o > +obj-$(CONFIG_OMAP_DM_SYSTIMER) += timer-ti-dm-systimer.o > obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o > obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o > obj-$(CONFIG_FTTMR010_TIMER) += timer-fttmr010.o
Hi, * Daniel Lezcano <daniel.lezcano@linaro.org> [220520 15:24]: > On 08/04/2022 12:17, Tony Lindgren wrote: > > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > > --- a/drivers/clocksource/Kconfig > > +++ b/drivers/clocksource/Kconfig > > @@ -22,7 +22,7 @@ config CLKEVT_I8253 > > config I8253_LOCK > > bool > > -config OMAP_DM_TIMER > > +config OMAP_DM_SYSTIMER > > bool > > select TIMER_OF > > @@ -56,6 +56,12 @@ config DIGICOLOR_TIMER > > help > > Enables the support for the digicolor timer driver. > > +config OMAP_DM_TIMER > > + tristate "OMAP dual-mode timer driver" if ARCH_K3 || COMPILE_TEST > > Actually, I missed this. Could you convert to a 'bool' there is no module in > the timer drivers ATM. OK sure will do. Did you notice some loadable module usage issues for timers that are not system timers? Just wondering if there are some issues that I did not notice. Regards, Tony
Hi Tony, On 23/05/2022 09:13, Tony Lindgren wrote: > Hi, > > * Daniel Lezcano <daniel.lezcano@linaro.org> [220520 15:24]: >> On 08/04/2022 12:17, Tony Lindgren wrote: >>> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig >>> --- a/drivers/clocksource/Kconfig >>> +++ b/drivers/clocksource/Kconfig >>> @@ -22,7 +22,7 @@ config CLKEVT_I8253 >>> config I8253_LOCK >>> bool >>> -config OMAP_DM_TIMER >>> +config OMAP_DM_SYSTIMER >>> bool >>> select TIMER_OF >>> @@ -56,6 +56,12 @@ config DIGICOLOR_TIMER >>> help >>> Enables the support for the digicolor timer driver. >>> +config OMAP_DM_TIMER >>> + tristate "OMAP dual-mode timer driver" if ARCH_K3 || COMPILE_TEST >> >> Actually, I missed this. Could you convert to a 'bool' there is no module in >> the timer drivers ATM. > > OK sure will do. > > Did you notice some loadable module usage issues for timers that are not > system timers? Just wondering if there are some issues that I did not > notice. I think the removal won't be supported. We already had a proposal to move one of the timer as a module but I wanted to have more insights about the changes, not just do that because of a GKI Android.
* Daniel Lezcano <daniel.lezcano@linaro.org> [220523 12:37]: > On 23/05/2022 09:13, Tony Lindgren wrote: > > Did you notice some loadable module usage issues for timers that are not > > system timers? Just wondering if there are some issues that I did not > > notice. > > I think the removal won't be supported. We already had a proposal to move > one of the timer as a module but I wanted to have more insights about the > changes, not just do that because of a GKI Android. OK good to know. Thanks, Tony
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -105,6 +105,7 @@ config ARCH_OMAP2PLUS select MACH_OMAP_GENERIC select MEMORY select MFD_SYSCON + select OMAP_DM_SYSTIMER select OMAP_DM_TIMER select OMAP_GPMC select PINCTRL @@ -160,6 +161,7 @@ config SOC_OMAP2420 bool "OMAP2420 support" depends on ARCH_OMAP2 default y + select OMAP_DM_SYSTIMER select OMAP_DM_TIMER select SOC_HAS_OMAP2_SDRC diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -22,7 +22,7 @@ config CLKEVT_I8253 config I8253_LOCK bool -config OMAP_DM_TIMER +config OMAP_DM_SYSTIMER bool select TIMER_OF @@ -56,6 +56,12 @@ config DIGICOLOR_TIMER help Enables the support for the digicolor timer driver. +config OMAP_DM_TIMER + tristate "OMAP dual-mode timer driver" if ARCH_K3 || COMPILE_TEST + select TIMER_OF + help + Enables the support for the TI dual-mode timer driver. + config DW_APB_TIMER bool "DW APB timer driver" if COMPILE_TEST help diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_CLKSRC_MMIO) += mmio.o obj-$(CONFIG_DAVINCI_TIMER) += timer-davinci.o obj-$(CONFIG_DIGICOLOR_TIMER) += timer-digicolor.o obj-$(CONFIG_OMAP_DM_TIMER) += timer-ti-dm.o -obj-$(CONFIG_OMAP_DM_TIMER) += timer-ti-dm-systimer.o +obj-$(CONFIG_OMAP_DM_SYSTIMER) += timer-ti-dm-systimer.o obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o obj-$(CONFIG_FTTMR010_TIMER) += timer-fttmr010.o
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 <j-keerthy@ti.com> Cc: Nishanth Menon <nm@ti.com> Cc: Vignesh Raghavendra <vigneshr@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/Kconfig | 2 ++ drivers/clocksource/Kconfig | 8 +++++++- drivers/clocksource/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-)