ARM: OMAP: dmtimer: fix missing content/correction in low-power mode support (dffc9dae) · Commits · 戴 / test

Since omap_dm_timer_write_reg/__omap_dm_timer_write is now modified to use timer->func_base OCP_CFG should not use this wrapper anymore. Instead use __raw_writel() directly and use timer->io_base instead to write to OCP_CFG. The timer->sys_stat is valid only if timer->revision is 1. In the context restore function make this correction. Save the contexts and loss count when timer is stopped. Also, disable the clock. Else, clock usecount would become imbalanced. Signed-off-by:

Tarun Kanti DebBarma <tarun.kanti@ti.com> Tested-by:

Omar Ramirez Luna <omar.ramirez@ti.com> Signed-off-by:

Tony Lindgren <tony@atomide.com>

arch/arm/plat-omap/dmtimer.c

+16 −3

Original line number	Diff line number	Diff line
		@@ -80,9 +80,9 @@ static void omap_dm_timer_write_reg(struct omap_dm_timer *timer, u32 reg,

		static void omap_timer_restore_context(struct omap_dm_timer *timer)
		{
		omap_dm_timer_write_reg(timer, OMAP_TIMER_OCP_CFG_OFFSET,
		timer->context.tiocp_cfg);
		if (timer->revision > 1)
		__raw_writel(timer->context.tiocp_cfg,
		timer->io_base + OMAP_TIMER_OCP_CFG_OFFSET);
		if (timer->revision == 1)
		__raw_writel(timer->context.tistat, timer->sys_stat);

		__raw_writel(timer->context.tisr, timer->irq_stat);
		@@ -357,6 +357,19 @@ int omap_dm_timer_stop(struct omap_dm_timer *timer)

		__omap_dm_timer_stop(timer, timer->posted, rate);

		if (timer->loses_context && timer->get_context_loss_count)
		timer->ctx_loss_count =
		timer->get_context_loss_count(&timer->pdev->dev);

		/*
		* Since the register values are computed and written within
		* __omap_dm_timer_stop, we need to use read to retrieve the
		* context.
		*/
		timer->context.tclr =
		omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);
		timer->context.tisr = __raw_readl(timer->irq_stat);
		omap_dm_timer_disable(timer);
		return 0;
		}
		EXPORT_SYMBOL_GPL(omap_dm_timer_stop);

Admin message