diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-11-30 11:59:33 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-11-30 11:59:33 +0800 |
| commit | 08c473f52af7434b09214fedcfce222fb9821033 (patch) | |
| tree | 555dc016292a132bd55096d42c945c61c6394174 /arch/arm/mach-mx6/clock.c | |
| parent | 9ae3b66a8ea648d977cbcebf02209f21cc9be3a4 (diff) | |
| parent | 57ade285e32285186879f96c346dd5b45a7f0dd6 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_1.1.0' into imx_3.0.35_android
Conflicts:
arch/arm/mach-mx6/board-mx6q_sabrelite.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/plat-mxc/cpufreq.c
Diffstat (limited to 'arch/arm/mach-mx6/clock.c')
| -rw-r--r-- | arch/arm/mach-mx6/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c index 1a8636e6eb45..b8b7b7bfa9a7 100644 --- a/arch/arm/mach-mx6/clock.c +++ b/arch/arm/mach-mx6/clock.c @@ -4245,7 +4245,7 @@ static struct clk caam_clk[] = { __INIT_CLK_DEBUG(caam_ipg_clk) .id = 2, .enable_reg = MXC_CCM_CCGR0, - .enable_shift = MXC_CCM_CCGRx_CG4_OFFSET, + .enable_shift = MXC_CCM_CCGRx_CG6_OFFSET, .enable = _clk_enable, .disable = _clk_disable, .parent = &mmdc_ch0_axi_clk[0], |