Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f2e42c6 authored by Guoqing Li's avatar Guoqing Li Committed by Tomi Valkeinen
Browse files

video: mmp: optimize some register setting code 



There are dumplicate code of the smooth setting based on different
path, optimized the routine and use readl_relaxed instead.

Signed-off-by: default avatarJett.Zhou <jtzhou@marvell.com>
Signed-off-by: default avatarJing Xiang <jxiang@marvell.com>
Signed-off-by: default avatarGuoqing Li <ligq@marvell.com>
Signed-off-by: default avatarZhou Zhu <zzhu3@marvell.com>
Reviewed-by: default avatarDaniel Drake <dsd@laptop.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 7ebdc78a

drivers/video/mmp/hw/mmp_ctrl.c

+7 −15
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static irqreturn_t ctrl_handle_irq(int irq, void *dev_id) 
		tmp = readl_relaxed(ctrl->reg_base + SPU_IRQ_ISR);

		if (tmp & isr)

			writel_relaxed(~isr, ctrl->reg_base + SPU_IRQ_ISR);

	} while ((isr = readl(ctrl->reg_base + SPU_IRQ_ISR)) & imask);

	} while ((isr = readl_relaxed(ctrl->reg_base + SPU_IRQ_ISR)) & imask);



	return IRQ_HANDLED;

}
@@ -372,20 +372,12 @@ static void path_set_default(struct mmp_path *path) 
	 * bus arbiter for faster read if not tv path;

	 * 2.enable horizontal smooth filter;

	 */

	if (PATH_PN == path->id) {

		mask = CFG_GRA_HSMOOTH_MASK | CFG_DMA_HSMOOTH_MASK

			| CFG_ARBFAST_ENA(1);

	mask = CFG_GRA_HSMOOTH_MASK | CFG_DMA_HSMOOTH_MASK | CFG_ARBFAST_ENA(1);

	tmp = readl_relaxed(ctrl_regs(path) + dma_ctrl(0, path->id));

	tmp |= mask;

	if (PATH_TV == path->id)

		tmp &= ~CFG_ARBFAST_ENA(1);

	writel_relaxed(tmp, ctrl_regs(path) + dma_ctrl(0, path->id));

	} else if (PATH_TV == path->id) {

		mask = CFG_GRA_HSMOOTH_MASK | CFG_DMA_HSMOOTH_MASK

			| CFG_ARBFAST_ENA(1);

		tmp = readl_relaxed(ctrl_regs(path) + dma_ctrl(0, path->id));

		tmp &= ~mask;

		tmp |= CFG_GRA_HSMOOTH_MASK | CFG_DMA_HSMOOTH_MASK;

		writel_relaxed(tmp, ctrl_regs(path) + dma_ctrl(0, path->id));

	}

}



static int path_init(struct mmphw_path_plat *path_plat,