diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 07:48:28 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 07:48:28 (GMT) |
| commit | 18e9550273b8a4d28044202f51cb2c3c9254d7c6 (patch) | |
| tree | a162ad088c712bd6dc35c7013cd30999731823c2 /arch/arm/mach-mxs/clock-mx23.c | |
| parent | 17292ecc07857bb16737c340dda289ab9d219e05 (diff) | |
| parent | d4f7e513234019a005c4d33477189f2a4e53bb9c (diff) | |
| download | linux-fsl-qoriq-18e9550273b8a4d28044202f51cb2c3c9254d7c6.tar.xz | |
Merge branch 'sh/st-integration' into sh-latest
Diffstat (limited to 'arch/arm/mach-mxs/clock-mx23.c')
| -rw-r--r-- | arch/arm/mach-mxs/clock-mx23.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/clock-mx23.c b/arch/arm/mach-mxs/clock-mx23.c index b1a362e..ca72a05 100644 --- a/arch/arm/mach-mxs/clock-mx23.c +++ b/arch/arm/mach-mxs/clock-mx23.c @@ -304,7 +304,7 @@ static int name##_set_rate(struct clk *clk, unsigned long rate) \ reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr); \ reg &= ~BM_CLKCTRL_##dr##_DIV; \ reg |= div << BP_CLKCTRL_##dr##_DIV; \ - if (reg | (1 << clk->enable_shift)) { \ + if (reg & (1 << clk->enable_shift)) { \ pr_err("%s: clock is gated\n", __func__); \ return -EINVAL; \ } \ @@ -347,7 +347,7 @@ static int name##_set_parent(struct clk *clk, struct clk *parent) \ { \ if (parent != clk->parent) { \ __raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit, \ - HW_CLKCTRL_CLKSEQ_TOG); \ + CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ_TOG); \ clk->parent = parent; \ } \ \ |