diff options
author | Alan Tull <alan.tull@freescale.com> | 2010-10-13 14:20:02 -0500 |
---|---|---|
committer | Justin Waters <justin.waters@timesys.com> | 2010-12-13 16:10:25 -0500 |
commit | aa3fcf7011fd98726ee9305bc424c93698033623 (patch) | |
tree | dc8b55f8c6f9a8b4474fd032e48500d050d70dab /arch | |
parent | de2debb7e38dfa8797277a2943628deb129cc509 (diff) |
ENGR00132580 allow prediv by 1 for ext1 clk
Not allowed in the spec, but the hardware guy said it was ok.
Needed because clock is shared between audio and camera.
Signed-off-by: Alan Tull <alan.tull@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mx5/clock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/clock.c b/arch/arm/mach-mx5/clock.c index 78e73fb14e28..7e77a5f280ec 100644 --- a/arch/arm/mach-mx5/clock.c +++ b/arch/arm/mach-mx5/clock.c @@ -2647,8 +2647,6 @@ static unsigned long _clk_ssi_ext1_get_rate(struct clk *clk) reg = __raw_readl(MXC_CCM_CS1CDR); prediv = ((reg & MXC_CCM_CS1CDR_SSI_EXT1_CLK_PRED_MASK) >> MXC_CCM_CS1CDR_SSI_EXT1_CLK_PRED_OFFSET) + 1; - if (prediv == 1) - BUG(); podf = ((reg & MXC_CCM_CS1CDR_SSI_EXT1_CLK_PODF_MASK) >> MXC_CCM_CS1CDR_SSI_EXT1_CLK_PODF_OFFSET) + 1; div = prediv * podf; |