diff options
| author |   Michael Turquette <mturquette@linaro.org> | 2014-11-24 17:45:33 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2014-11-24 17:45:33 -0800 |
| commit | da57b46010dd8d93aabc4c3e8d11751ac617d914 (patch) | |
| tree | 1fe26ac6679ea8e76276da87582fcb95210974ed /drivers/clk/pxa | |
| parent | clk: hi3620: Move const initdata into correct code section (diff) | |
| parent | clk: pxa: fix pxa27x CCCR bit usage (diff) | |
| download | linux-dev-da57b46010dd8d93aabc4c3e8d11751ac617d914.tar.xz linux-dev-da57b46010dd8d93aabc4c3e8d11751ac617d914.zip | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/pxa')
| -rw-r--r-- | drivers/clk/pxa/clk-pxa27x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c index bb8dfbc747ba..5f9b54b024b9 100644 --- a/drivers/clk/pxa/clk-pxa27x.c +++ b/drivers/clk/pxa/clk-pxa27x.c @@ -322,7 +322,7 @@ static unsigned long clk_pxa27x_memory_get_rate(struct clk_hw *hw, unsigned long ccsr = CCSR; osc_forced = ccsr & (1 << CCCR_CPDIS_BIT); - a = cccr & CCCR_A_BIT; + a = cccr & (1 << CCCR_A_BIT); l = ccsr & CCSR_L_MASK; if (osc_forced || a) @@ -341,7 +341,7 @@ static u8 clk_pxa27x_memory_get_parent(struct clk_hw *hw) unsigned long ccsr = CCSR; osc_forced = ccsr & (1 << CCCR_CPDIS_BIT); - a = cccr & CCCR_A_BIT; + a = cccr & (1 << CCCR_A_BIT); if (osc_forced) return PXA_MEM_13Mhz; if (a) |