Skip to content
Snippets Groups Projects
Commit 5aa0769d authored by Hans-Christian Egtvedt's avatar Hans-Christian Egtvedt Committed by Linus Torvalds
Browse files

atmel_pwm: set up only one PWM clock when allocating a clock


This patch will only setup one clock, if free, and return this clock to the
caller.  The previous solution would setup both clocks with the same prescaler
and divider and return PWM_CPR_CLKB, thus taking both clocks in the same call
without the caller knowing.

Signed-off-by: default avatarHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 82736f4d
No related branches found
No related tags found
No related merge requests found
...@@ -211,8 +211,7 @@ int pwm_clk_alloc(unsigned prescale, unsigned div) ...@@ -211,8 +211,7 @@ int pwm_clk_alloc(unsigned prescale, unsigned div)
if ((mr & 0xffff) == 0) { if ((mr & 0xffff) == 0) {
mr |= val; mr |= val;
ret = PWM_CPR_CLKA; ret = PWM_CPR_CLKA;
} } else if ((mr & (0xffff << 16)) == 0) {
if ((mr & (0xffff << 16)) == 0) {
mr |= val << 16; mr |= val << 16;
ret = PWM_CPR_CLKB; ret = PWM_CPR_CLKB;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment