hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: OMAP: Add flag to indicate if a timer needs a manual reset 

For OMAP1 devices, it is necessary to perform a manual reset of the timer.
Currently, this is indicating by setting the "needs_manual_reset" variable in
the platform data. Instead of using an extra variable to indicate this add a new
timer capabilities flag to indicate this and remove the "needs_manual_reset"
member from the platform data.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Jon Hunter 2012-06-05 12:34:57 -05:00 committed by Tony Lindgren
parent 0b30ec1cb7
commit 6615975bc5
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-omap1/timer.c
View File

@ -140,8 +140,8 @@ static int __init omap1_dm_timer_init(void)
} }
pdata->set_timer_src = omap1_dm_timer_set_src; pdata->set_timer_src = omap1_dm_timer_set_src;
pdata->needs_manual_reset = 1; pdata->timer_capability = OMAP_TIMER_ALWON |
pdata->timer_capability = OMAP_TIMER_ALWON; OMAP_TIMER_NEEDS_RESET;
ret = platform_device_add_data(pdev, pdata, sizeof(*pdata)); ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
if (ret) { if (ret) {

9
arch/arm/plat-omap/dmtimer.c
View File

@ -135,7 +135,6 @@ static void omap_dm_timer_reset(struct omap_dm_timer *timer)
int omap_dm_timer_prepare(struct omap_dm_timer *timer) int omap_dm_timer_prepare(struct omap_dm_timer *timer)
{ {
struct dmtimer_platform_data *pdata = timer->pdev->dev.platform_data;
int ret; int ret;
timer->fclk = clk_get(&timer->pdev->dev, "fck"); timer->fclk = clk_get(&timer->pdev->dev, "fck");
@ -145,7 +144,7 @@ int omap_dm_timer_prepare(struct omap_dm_timer *timer)
return -EINVAL; return -EINVAL;
} }
if (pdata->needs_manual_reset) if (timer->capability & OMAP_TIMER_NEEDS_RESET)
omap_dm_timer_reset(timer); omap_dm_timer_reset(timer);
ret = omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ); ret = omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ);
@ -363,13 +362,11 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_start);
int omap_dm_timer_stop(struct omap_dm_timer *timer) int omap_dm_timer_stop(struct omap_dm_timer *timer)
{ {
unsigned long rate = 0; unsigned long rate = 0;
struct dmtimer_platform_data *pdata;
if (unlikely(!timer)) if (unlikely(!timer))
return -EINVAL; return -EINVAL;
pdata = timer->pdev->dev.platform_data; if (!(timer->capability & OMAP_TIMER_NEEDS_RESET))
if (!pdata->needs_manual_reset)
rate = clk_get_rate(timer->fclk); rate = clk_get_rate(timer->fclk);
__omap_dm_timer_stop(timer, timer->posted, rate); __omap_dm_timer_stop(timer, timer->posted, rate);
@ -694,7 +691,7 @@ static int __devinit omap_dm_timer_probe(struct platform_device *pdev)
timer->capability = pdata->timer_capability; timer->capability = pdata->timer_capability;
/* Skip pm_runtime_enable for OMAP1 */ /* Skip pm_runtime_enable for OMAP1 */
if (!pdata->needs_manual_reset) { if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
pm_runtime_irq_safe(&pdev->dev); pm_runtime_irq_safe(&pdev->dev);
} }

2
arch/arm/plat-omap/include/plat/dmtimer.h
View File

@ -59,6 +59,7 @@
#define OMAP_TIMER_SECURE 0x80000000 #define OMAP_TIMER_SECURE 0x80000000
#define OMAP_TIMER_ALWON 0x40000000 #define OMAP_TIMER_ALWON 0x40000000
#define OMAP_TIMER_HAS_PWM 0x20000000 #define OMAP_TIMER_HAS_PWM 0x20000000
#define OMAP_TIMER_NEEDS_RESET 0x10000000
struct omap_timer_capability_dev_attr { struct omap_timer_capability_dev_attr {
u32 timer_capability; u32 timer_capability;
@ -90,7 +91,6 @@ struct timer_regs {
struct dmtimer_platform_data { struct dmtimer_platform_data {
int (*set_timer_src)(struct platform_device *pdev, int source); int (*set_timer_src)(struct platform_device *pdev, int source);
u32 needs_manual_reset:1;
u32 timer_capability; u32 timer_capability;
}; };