diff options
| author | Ranjani Vaidyanathan-RA5478 <Ranjani.Vaidyanathan@freescale.com> | 2009-12-11 10:58:00 -0600 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-02-12 17:19:46 +0100 |
| commit | a1a071627e7b81f3ca5d6cd5067fbc81b2be4b7f (patch) | |
| tree | c646f1330b7a139334bdb0f43c768f8c97f44c6e /drivers/mxc | |
| parent | bfdfea874633ef19defa77d8bc878bfd53b8f8f7 (diff) | |
ENGR00119263: MX51 : Fix pll_set_rate function
pll_set_rate function should only wait for PLL relock if PLL is enabled.
Also add a timeout to the infinte loop.
Signed-off-by: Ranjani Vaidyanathan-RA5478 <Ranjani.Vaidyanathan@freescale.com>
Diffstat (limited to 'drivers/mxc')
| -rw-r--r-- | drivers/mxc/ipu3/ipu_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mxc/ipu3/ipu_common.c b/drivers/mxc/ipu3/ipu_common.c index 5d90d47e34b9..56657b8f6ea1 100644 --- a/drivers/mxc/ipu3/ipu_common.c +++ b/drivers/mxc/ipu3/ipu_common.c @@ -212,7 +212,7 @@ static void _ipu_pixel_clk_disable(struct clk *clk) static int _ipu_pixel_clk_set_parent(struct clk *clk, struct clk *parent) { - u32 di_gen = 0;/*__raw_readl(DI_GENERAL(clk->id));*/ + u32 di_gen = __raw_readl(DI_GENERAL(clk->id)); if (parent == g_ipu_clk) di_gen &= ~DI_GEN_DI_CLK_EXT; |