diff options
| author | Olof Johansson <olof@lixom.net> | 2011-11-11 17:53:46 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-11-11 17:53:46 +0100 |
| commit | 09d37c4ba9b20d6b694bfd7339850ba9a826fb13 (patch) | |
| tree | 2ee2fdf15e72e450bbfccd9733205b265da0538f /arch/arm/mach-mx5/clock-mx51-mx53.c | |
| parent | Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm i... (diff) | |
| parent | arm/imx: fix imx6q mmc error when mounting rootfs (diff) | |
| download | linux-09d37c4ba9b20d6b694bfd7339850ba9a826fb13.tar.xz linux-09d37c4ba9b20d6b694bfd7339850ba9a826fb13.zip | |
Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-mx5/clock-mx51-mx53.c')
| -rw-r--r-- | arch/arm/mach-mx5/clock-mx51-mx53.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c index 6312425c0056..4cb276977190 100644 --- a/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c @@ -1281,9 +1281,9 @@ DEFINE_CLOCK(gpt_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG9_OFFSET, NULL, NULL, &ipg_clk, &gpt_ipg_clk); DEFINE_CLOCK(pwm1_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG6_OFFSET, - NULL, NULL, &ipg_clk, NULL); + NULL, NULL, &ipg_perclk, NULL); DEFINE_CLOCK(pwm2_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG8_OFFSET, - NULL, NULL, &ipg_clk, NULL); + NULL, NULL, &ipg_perclk, NULL); /* I2C */ DEFINE_CLOCK(i2c1_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG9_OFFSET, |