diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-07-05 13:03:01 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-07-05 13:03:01 -0700 |
| commit | ad3b90a62c426c1a2874c1b744f24d24c67d7683 (patch) | |
| tree | 8215cb14a95cd840a091efe061740281237c17ae /arch | |
| parent | 6ab0928f6e326e83d56364b65527ef8bb0f2be41 (diff) | |
Revert "i.MX6: Add fix pll4 set_rate callback"
This reverts commit c38a24542ba582af2d7852c0e6b61ac9f0313a72.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx6/clock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c index 60e59271ac52..cd9862059be8 100644 --- a/arch/arm/mach-mx6/clock.c +++ b/arch/arm/mach-mx6/clock.c @@ -1024,9 +1024,7 @@ static int _clk_audio_video_set_rate(struct clk *clk, unsigned long rate) __raw_writel(mfn, pllbase + PLL_NUM_DIV_OFFSET); __raw_writel(mfd, pllbase + PLL_DENOM_DIV_OFFSET); - if ((rev >= IMX_CHIP_REVISION_1_1) - && - (pllbase == PLL5_VIDEO_BASE_ADDR)) { + if (rev >= IMX_CHIP_REVISION_1_1) { reg = __raw_readl(ANA_MISC2_BASE_ADDR) & ~ANADIG_ANA_MISC2_CONTROL3_MASK; reg |= control3 << ANADIG_ANA_MISC2_CONTROL3_OFFSET; |