From eb30199b46e3d4ed73d2ad0b7f4da418d7da1da8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 31 Dec 2014 14:22:42 +0200 Subject: [PATCH] OMAPDSS: PLL: add dss_pll_wait_reset_done() Add a helper function to wait until the PLL's reset is done. Signed-off-by: Tomi Valkeinen --- drivers/video/fbdev/omap2/dss/dss.h | 1 + drivers/video/fbdev/omap2/dss/pll.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/drivers/video/fbdev/omap2/dss/dss.h b/drivers/video/fbdev/omap2/dss/dss.h index 1826ee96265b..d6c9c3d3db14 100644 --- a/drivers/video/fbdev/omap2/dss/dss.h +++ b/drivers/video/fbdev/omap2/dss/dss.h @@ -453,5 +453,6 @@ int dss_pll_write_config_type_a(struct dss_pll *pll, const struct dss_pll_clock_info *cinfo); int dss_pll_write_config_type_b(struct dss_pll *pll, const struct dss_pll_clock_info *cinfo); +int dss_pll_wait_reset_done(struct dss_pll *pll); #endif diff --git a/drivers/video/fbdev/omap2/dss/pll.c b/drivers/video/fbdev/omap2/dss/pll.c index 335ffac224b9..f974ddcd3b6e 100644 --- a/drivers/video/fbdev/omap2/dss/pll.c +++ b/drivers/video/fbdev/omap2/dss/pll.c @@ -222,6 +222,16 @@ static int wait_for_bit_change(void __iomem *reg, int bitnum, int value) return !value; } +int dss_pll_wait_reset_done(struct dss_pll *pll) +{ + void __iomem *base = pll->base; + + if (wait_for_bit_change(base + PLL_STATUS, 0, 1) != 1) + return -ETIMEDOUT; + else + return 0; +} + static int dss_wait_hsdiv_ack(struct dss_pll *pll, u32 hsdiv_ack_mask) { int t = 100;