TI timer changes for am6
Tony Lindgren
maintainerv2 cover TI timer changes for am6
Hi,
Here's v2 version of the timer changes for TI am6.
Regards,
Tony
Changes since v1:
- Change the new compatible to ti,am654-timer for the first compatible SoC as suggested by Nishanth
- Separate out the binding to convert it to yaml first as suggested by Nishanth
- Drop the header ifdefs by moving inline functions to the driver based on suggestion by Daniel
Tony Lindgren (3):
clocksource/drivers/timer-ti-dm: Move inline functions to driver for
am6
clocksource/drivers/timer-ti-dm: Make timer selectable for ARCH_K3 clocksource/drivers/timer-ti-dm: Add compatible for am6 SoCs
arch/arm/mach-omap2/Kconfig | 2 + drivers/clocksource/Kconfig | 8 +- drivers/clocksource/Makefile | 2 +- drivers/clocksource/timer-ti-dm.c | 123 +++++++++++++++++++++++++ include/clocksource/timer-ti-dm.h | 144 ------------------------------ 5 files changed, 133 insertions(+), 146 deletions(-)
Signature · 1 line
2.35.1
Tony Lindgren
maintainerPATCH v2 1/3 clocksource/drivers/timer-ti-dm: Move inline functions to driver for am6
The __omap_dm_timer_* inline functions in the header are no longer needed outside the driver, and the header ifdefs prevent the driver working for ARCH_K3.
Let's move the inline functions to the driver and drop the ifdefs and drop the unused functions __omap_dm_timer_override_errata() and __omap_dm_timer_load_start().
--- drivers/clocksource/timer-ti-dm.c | 115 ++++++++++++++++++++++++ include/clocksource/timer-ti-dm.h | 144 ------------------------------ 2 files changed, 115 insertions(+), 144 deletions(-)
drivers/clocksource/timer-ti-dm.c +115 -0
@@ -44,6 +44,121 @@ enum { REQUEST_BY_NODE, }; +static inline u32 __omap_dm_timer_read (struct omap_dm_timer *timer,u32 reg, +int posted) +{ +if (posted) +while (readl_relaxed (timer->pend) & (reg >>WPSHIFT )) +cpu_relax (); + +return readl_relaxed (timer->func_base + (reg &0xff )); +} + +static inline void __omap_dm_timer_write (struct omap_dm_timer *timer, +u32 reg,u32 val,int posted) +{ +if (posted) +while (readl_relaxed (timer->pend) & (reg >>WPSHIFT )) +cpu_relax (); + +writel_relaxed (val, timer->func_base + (reg &0xff )); +} + +static inline void __omap_dm_timer_init_regs (struct omap_dm_timer *timer) +{ +u32 tidr; + +/* Assume v1 ip if bits [31:16] are zero */ + tidr =readl_relaxed (timer->io_base); +if (!(tidr >>16 )) { + timer->revision =1 ; + timer->irq_stat = timer->io_base +OMAP_TIMER_V1_STAT_OFFSET ; + timer->irq_ena = timer->io_base +OMAP_TIMER_V1_INT_EN_OFFSET ; + timer->irq_dis = timer->io_base +OMAP_TIMER_V1_INT_EN_OFFSET ; + timer->pend = timer->io_base + _OMAP_TIMER_WRITE_PEND_OFFSET; + timer->func_base = timer->io_base; + }else { + timer->revision =2 ; + timer->irq_stat = timer->io_base +OMAP_TIMER_V2_IRQSTATUS ; + timer->irq_ena = timer->io_base +OMAP_TIMER_V2_IRQENABLE_SET ; + timer->irq_dis = timer->io_base +OMAP_TIMER_V2_IRQENABLE_CLR ; + timer->pend = timer->io_base + + _OMAP_TIMER_WRITE_PEND_OFFSET + +OMAP_TIMER_V2_FUNC_OFFSET ; + timer->func_base = timer->io_base +OMAP_TIMER_V2_FUNC_OFFSET ; + } +} + +/* +* __omap_dm_timer_enable_posted - enables write posted mode +* @timer: pointer to timer instance handle +* +* Enables the write posted mode for the timer. When posted mode is enabled +* writes to certain timer registers are immediately acknowledged by the +* internal bus and hence prevents stalling the CPU waiting for the write to +* complete. Enabling this feature can improve performance for writing to the +* timer registers. +*/ +static inline void __omap_dm_timer_enable_posted (struct omap_dm_timer *timer) +{ +if (timer->posted) +return ; + +if (timer->errata &OMAP_TIMER_ERRATA_I103_I767 ) { + timer->posted =OMAP_TIMER_NONPOSTED ; +__omap_dm_timer_write (timer,OMAP_TIMER_IF_CTRL_REG ,0 ,0 ); +return ; + } + +__omap_dm_timer_write (timer,OMAP_TIMER_IF_CTRL_REG , +OMAP_TIMER_CTRL_POSTED ,0 ); + timer->context.tsicr =OMAP_TIMER_CTRL_POSTED ; + timer->posted =OMAP_TIMER_POSTED ; +} + +static inline void __omap_dm_timer_stop (struct omap_dm_timer *timer, +int posted,unsigned long rate) +{ +u32 l; + + l =__omap_dm_timer_read (timer,OMAP_TIMER_CTRL_REG , posted); +if (l &OMAP_TIMER_CTRL_ST ) { + l &= ~0x1 ; +__omap_dm_timer_write (timer,OMAP_TIMER_CTRL_REG , l, posted); +#ifdef CONFIG_ARCH_OMAP2PLUS +/* Readback to make sure write has completed */ +__omap_dm_timer_read (timer,OMAP_TIMER_CTRL_REG , posted); +/* +* Wait for functional clock period x 3.5 to make sure that +* timer is stopped +*/ +udelay (3500000 / rate +1 ); +#endif + } + +/* Ack possibly pending interrupt */ +writel_relaxed (OMAP_TIMER_INT_OVERFLOW , timer->irq_stat); +} + +static inline void __omap_dm_timer_int_enable (struct omap_dm_timer *timer, +unsigned int value) +{ +writel_relaxed (value, timer->irq_ena); +__omap_dm_timer_write (timer,OMAP_TIMER_WAKEUP_EN_REG , value,0 ); +} + +static inline unsigned int +__omap_dm_timer_read_counter (struct omap_dm_timer *timer,int posted) +{ +return __omap_dm_timer_read (timer,OMAP_TIMER_COUNTER_REG , posted); +} + +static inline void __omap_dm_timer_write_status (struct omap_dm_timer *timer, +unsigned int value) +{ +writel_relaxed (value, timer->irq_stat); +} +/** * omap_dm_timer_read_reg - read timer registers in posted and non-posted mode * @timer: timer pointer over which read operation to perform
include/clocksource/timer-ti-dm.h +0 -144
148 lines not on this page · raw message
Signature · 1 line
2.35.1
Tony Lindgren
maintainerPATCH v2 2/3 clocksource/drivers/timer-ti-dm: Make timer selectable for ARCH_K3
In reply to Tony LindgrenLet'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.
--- arch/arm/mach-omap2/Kconfig | 2 ++ drivers/clocksource/Kconfig | 8 +++++++- drivers/clocksource/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/Kconfig +2 -0
@@ -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
drivers/clocksource/Kconfig +7 -1
@@ -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
drivers/clocksource/Makefile +1 -1
@@ -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
Signature · 1 line
2.35.1
Tony Lindgren
maintainerPATCH v2 3/3 clocksource/drivers/timer-ti-dm: Add compatible for am6 SoCs
In reply to Tony LindgrenAdd compatible for ti,am654-timer to support the timers. For example, am654 has four timers in the MCU domain and 12 timers in the MAIN domain.
--- drivers/clocksource/timer-ti-dm.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clocksource/timer-ti-dm.c +8 -0
@@ -1037,6 +1037,10 @@ static const struct dmtimer_platform_data omap3plus_pdata = { .timer_ops = &dmtimer_ops, }; +static const struct dmtimer_platform_data am6_pdata = { + .timer_ops = &dmtimer_ops, +}; +static const struct of_device_id omap_timer_match[] = { { .compatible ="ti,omap2420-timer" ,
@@ -1065,6 +1069,10 @@ static const struct of_device_id omap_timer_match[] = { .compatible = "ti,dm816-timer", .data = &omap3plus_pdata, }, + { + .compatible = "ti,am654-timer", + .data = &am6_pdata, + }, {}, };MODULE_DEVICE_TABLE (of, omap_timer_match);
Signature · 1 line
2.35.1
Re: [PATCH 2/3] clocksource/drivers/timer-ti-dm: Make timer selectable for ARCH_K3
In reply to Tony LindgrenQuoted 49 lines · Tony Lindgren
Let's make timer-ti-dm selectable for
ARCH_K3, and add a separate option forOMAP_DM_SYSTIMERas there should be no need for it onARCH_K3.For older TI SoCs, we are already selecting
OMAP_DM_TIMERinarch/arm/mach-omap*/Kconfig. For mach-omap2, we need to now also selectOMAP_DM_SYSTIMER.Cc Keerthy <[email protected]>Cc Nishanth Menon <[email protected]>Cc Vignesh Raghavendra <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap2/Kconfig | 2 ++ drivers/clocksource/Kconfig | 8 +++++++- drivers/clocksource/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-)arch/arm/mach-omap2/Kconfig +2
-0@@ -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_SDRCdrivers/clocksource/Kconfig +1
-1@@ -22,7 +22,7 @@ config CLKEVT_I8253 config I8253_LOCK bool -config OMAP_DM_TIMER +config OMAP_DM_SYSTIMER bool select TIMER_OF
drivers/clocksource/Kconfig config DIGICOLOR_TIMER · line 60
Quoted 5 lines
drivers/clocksource/Kconfig +2
-0@@ -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.
Quoted 19 lines
drivers/clocksource/Kconfig +4
-0+ 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 helpdrivers/clocksource/Makefile +1
-1@@ -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
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Tony Lindgren
maintainerRe: [PATCH 2/3] clocksource/drivers/timer-ti-dm: Make timer selectable for ARCH_K3
Hi,
Quoted 11 lines · Daniel Lezcano
Quoted 10 lines · Tony Lindgren
drivers/clocksource/Kconfig +1
-1@@ -22,7 +22,7 @@ config CLKEVT_I8253 config I8253_LOCK bool -config OMAP_DM_TIMER +config OMAP_DM_SYSTIMER bool select TIMER_OF
Quoted 8 lines
drivers/clocksource/Kconfig config DIGICOLOR_TIMER · line 59
Quoted 5 lines
drivers/clocksource/Kconfig +2
-0@@ -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_TESTActually, 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
Re: [PATCH 2/3] clocksource/drivers/timer-ti-dm: Make timer selectable for ARCH_K3
Hi Tony,
Quoted 23 lines · Tony Lindgren
Hi,
Quoted 11 lines · Daniel Lezcano
Quoted 10 lines · Tony Lindgren
drivers/clocksource/Kconfig +1
-1@@ -22,7 +22,7 @@ config CLKEVT_I8253 config I8253_LOCK bool -config OMAP_DM_TIMER +config OMAP_DM_SYSTIMER bool select TIMER_OFQuoted 8 lines
drivers/clocksource/Kconfig config DIGICOLOR_TIMER · line 59
Quoted 5 lines
drivers/clocksource/Kconfig +2
-0@@ -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_TESTActually, I missed this. Could you convert to a 'bool' there is no module in the timer drivers ATM.
Quoted 5 lines
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.
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Tony Lindgren
maintainerRe: [PATCH 2/3] clocksource/drivers/timer-ti-dm: Make timer selectable for ARCH_K3
Quoted 8 lines · Daniel Lezcano
Quoted 3 lines · Tony Lindgren
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
[tip: timers/core] clocksource/drivers/timer-ti-dm: Add compatible for am6 SoCs
In reply to Tony LindgrenThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 4e3203610a889c72e96ddfc9e601b9349ef19c00 Gitweb: https://git.kernel.org/tip/4e3203610a889c72e96ddfc9e601b9349ef19c00 Author: Tony Lindgren <[email protected]> AuthorDate: Fri, 08 Apr 2022 13:17:15 +03:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Wed, 27 Jul 2022 17:00:48 +02:00
clocksource/drivers/timer-ti-dm: Add compatible for am6 SoCs
Add compatible for ti,am654-timer to support the timers. For example, am654 has four timers in the MCU domain and 12 timers in the MAIN domain.
--- drivers/clocksource/timer-ti-dm.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clocksource/timer-ti-dm.c +8 -0
@@ -1036,6 +1036,10 @@ static const struct dmtimer_platform_data omap3plus_pdata = { .timer_ops = &dmtimer_ops, }; +static const struct dmtimer_platform_data am6_pdata = { + .timer_ops = &dmtimer_ops, +}; +static const struct of_device_id omap_timer_match[] = { { .compatible ="ti,omap2420-timer" ,
@@ -1064,6 +1068,10 @@ static const struct of_device_id omap_timer_match[] = { .compatible = "ti,dm816-timer", .data = &omap3plus_pdata, }, + { + .compatible = "ti,am654-timer", + .data = &am6_pdata, + }, {}, };MODULE_DEVICE_TABLE (of, omap_timer_match);
[tip: timers/core] clocksource/drivers/timer-ti-dm: Make timer selectable for ARCH_K3
In reply to Tony LindgrenThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: ab0bbef3ae0f6b5a3b60671cd0124d0fc4fc2567 Gitweb: https://git.kernel.org/tip/ab0bbef3ae0f6b5a3b60671cd0124d0fc4fc2567 Author: Tony Lindgren <[email protected]> AuthorDate: Fri, 08 Apr 2022 13:17:14 +03:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Wed, 27 Jul 2022 17:00:48 +02:00
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.
--- arch/arm/mach-omap2/Kconfig | 2 ++ drivers/clocksource/Kconfig | 8 +++++++- drivers/clocksource/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/Kconfig +2 -0
@@ -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
drivers/clocksource/Kconfig +7 -1
@@ -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
drivers/clocksource/Makefile +1 -1
@@ -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
[tip: timers/core] clocksource/drivers/timer-ti-dm: Move inline functions to driver for am6
In reply to Tony LindgrenThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 41e79b1d458477212d0a880c87622bcaa69ab3ea Gitweb: https://git.kernel.org/tip/41e79b1d458477212d0a880c87622bcaa69ab3ea Author: Tony Lindgren <[email protected]> AuthorDate: Fri, 08 Apr 2022 13:17:13 +03:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Wed, 27 Jul 2022 17:00:48 +02:00
clocksource/drivers/timer-ti-dm: Move inline functions to driver for am6
The __omap_dm_timer_* inline functions in the header are no longer needed outside the driver, and the header ifdefs prevent the driver working for ARCH_K3.
Let's move the inline functions to the driver and drop the ifdefs and drop the unused functions __omap_dm_timer_override_errata() and __omap_dm_timer_load_start().
--- drivers/clocksource/timer-ti-dm.c | 115 +++++++++++++++++++++++- include/clocksource/timer-ti-dm.h | 144 +----------------------------- 2 files changed, 115 insertions(+), 144 deletions(-)
drivers/clocksource/timer-ti-dm.c +115 -0
@@ -44,6 +44,121 @@ enum { REQUEST_BY_NODE, }; +static inline u32 __omap_dm_timer_read (struct omap_dm_timer *timer,u32 reg, +int posted) +{ +if (posted) +while (readl_relaxed (timer->pend) & (reg >>WPSHIFT )) +cpu_relax (); + +return readl_relaxed (timer->func_base + (reg &0xff )); +} + +static inline void __omap_dm_timer_write (struct omap_dm_timer *timer, +u32 reg,u32 val,int posted) +{ +if (posted) +while (readl_relaxed (timer->pend) & (reg >>WPSHIFT )) +cpu_relax (); + +writel_relaxed (val, timer->func_base + (reg &0xff )); +} + +static inline void __omap_dm_timer_init_regs (struct omap_dm_timer *timer) +{ +u32 tidr; + +/* Assume v1 ip if bits [31:16] are zero */ + tidr =readl_relaxed (timer->io_base); +if (!(tidr >>16 )) { + timer->revision =1 ; + timer->irq_stat = timer->io_base +OMAP_TIMER_V1_STAT_OFFSET ; + timer->irq_ena = timer->io_base +OMAP_TIMER_V1_INT_EN_OFFSET ; + timer->irq_dis = timer->io_base +OMAP_TIMER_V1_INT_EN_OFFSET ; + timer->pend = timer->io_base + _OMAP_TIMER_WRITE_PEND_OFFSET; + timer->func_base = timer->io_base; + }else { + timer->revision =2 ; + timer->irq_stat = timer->io_base +OMAP_TIMER_V2_IRQSTATUS ; + timer->irq_ena = timer->io_base +OMAP_TIMER_V2_IRQENABLE_SET ; + timer->irq_dis = timer->io_base +OMAP_TIMER_V2_IRQENABLE_CLR ; + timer->pend = timer->io_base + + _OMAP_TIMER_WRITE_PEND_OFFSET + +OMAP_TIMER_V2_FUNC_OFFSET ; + timer->func_base = timer->io_base +OMAP_TIMER_V2_FUNC_OFFSET ; + } +} + +/* +* __omap_dm_timer_enable_posted - enables write posted mode +* @timer: pointer to timer instance handle +* +* Enables the write posted mode for the timer. When posted mode is enabled +* writes to certain timer registers are immediately acknowledged by the +* internal bus and hence prevents stalling the CPU waiting for the write to +* complete. Enabling this feature can improve performance for writing to the +* timer registers. +*/ +static inline void __omap_dm_timer_enable_posted (struct omap_dm_timer *timer) +{ +if (timer->posted) +return ; + +if (timer->errata &OMAP_TIMER_ERRATA_I103_I767 ) { + timer->posted =OMAP_TIMER_NONPOSTED ; +__omap_dm_timer_write (timer,OMAP_TIMER_IF_CTRL_REG ,0 ,0 ); +return ; + } + +__omap_dm_timer_write (timer,OMAP_TIMER_IF_CTRL_REG , +OMAP_TIMER_CTRL_POSTED ,0 ); + timer->context.tsicr =OMAP_TIMER_CTRL_POSTED ; + timer->posted =OMAP_TIMER_POSTED ; +} + +static inline void __omap_dm_timer_stop (struct omap_dm_timer *timer, +int posted,unsigned long rate) +{ +u32 l; + + l =__omap_dm_timer_read (timer,OMAP_TIMER_CTRL_REG , posted); +if (l &OMAP_TIMER_CTRL_ST ) { + l &= ~0x1 ; +__omap_dm_timer_write (timer,OMAP_TIMER_CTRL_REG , l, posted); +#ifdef CONFIG_ARCH_OMAP2PLUS +/* Readback to make sure write has completed */ +__omap_dm_timer_read (timer,OMAP_TIMER_CTRL_REG , posted); +/* +* Wait for functional clock period x 3.5 to make sure that +* timer is stopped +*/ +udelay (3500000 / rate +1 ); +#endif + } + +/* Ack possibly pending interrupt */ +writel_relaxed (OMAP_TIMER_INT_OVERFLOW , timer->irq_stat); +} + +static inline void __omap_dm_timer_int_enable (struct omap_dm_timer *timer, +unsigned int value) +{ +writel_relaxed (value, timer->irq_ena); +__omap_dm_timer_write (timer,OMAP_TIMER_WAKEUP_EN_REG , value,0 ); +} + +static inline unsigned int +__omap_dm_timer_read_counter (struct omap_dm_timer *timer,int posted) +{ +return __omap_dm_timer_read (timer,OMAP_TIMER_COUNTER_REG , posted); +} + +static inline void __omap_dm_timer_write_status (struct omap_dm_timer *timer, +unsigned int value) +{ +writel_relaxed (value, timer->irq_stat); +} +/** * omap_dm_timer_read_reg - read timer registers in posted and non-posted mode * @timer: timer pointer over which read operation to perform
include/clocksource/timer-ti-dm.h +0 -144
148 lines not on this page · raw message