diff options
| author | Tony Lin <tony.lin@freescale.com> | 2011-09-02 14:36:11 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@canonical.com> | 2011-11-10 07:38:37 +0800 |
| commit | 8b366b09b4a4658a81249e88da296ddcfdacadeb (patch) | |
| tree | 6e0849f8a4e429d6b427eaf845f09695295ed24a /arch/arm/mach-mx6/clock.c | |
| parent | 0c365f921da50352a52a3bae8bd4684032382e68 (diff) | |
ENGR00155893 [mx6q]clock: correct set parent function
set periph_clk_sel to derive clock from periph_clk2_clk
Signed-off-by: Tony Lin <tony.lin@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx6/clock.c')
| -rw-r--r-- | arch/arm/mach-mx6/clock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c index 0ccae284bb0..58484407ec3 100644 --- a/arch/arm/mach-mx6/clock.c +++ b/arch/arm/mach-mx6/clock.c @@ -938,9 +938,12 @@ static int _clk_periph_set_parent(struct clk *clk, struct clk *parent) reg &= ~MXC_CCM_CBCDR_PERIPH_CLK_SEL; __raw_writel(reg, MXC_CCM_CBCDR); } else { - /* Set the periph_clk2_podf divider to divide by 1. */ reg = __raw_readl(MXC_CCM_CBCDR); + /* Set the periph_clk2_podf divider to divide by 1. */ reg &= ~MXC_CCM_CBCDR_PERIPH_CLK2_PODF_MASK; + /* Clear periph_clk_sel to select periph_clk2. */ + reg |= MXC_CCM_CBCDR_PERIPH_CLK_SEL; + __raw_writel(reg, MXC_CCM_CBCDR); /* Set the periph_clk2_sel mux. */ |