projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9fa73dd
)
pinctrl:fix _rockchip_pinconf_set bug
author
luowei
<lw@rock-chips.com>
Mon, 31 Mar 2014 08:35:49 +0000
(16:35 +0800)
committer
luowei
<lw@rock-chips.com>
Mon, 31 Mar 2014 08:36:09 +0000
(16:36 +0800)
drivers/pinctrl/pinctrl-rockchip.c
patch
|
blob
|
history
diff --git
a/drivers/pinctrl/pinctrl-rockchip.c
b/drivers/pinctrl/pinctrl-rockchip.c
index b875374722c0574994933ced27bfa6ee5494d3f8..2a8db2972ee52eb11dba339970f4605c5619352e 100755
(executable)
--- a/
drivers/pinctrl/pinctrl-rockchip.c
+++ b/
drivers/pinctrl/pinctrl-rockchip.c
@@
-1630,7
+1630,7
@@
static int _rockchip_pinconf_set(struct rockchip_pin_bank *bank,
for(i=0; i < j; i++)
{
reg = info->reg_base + reg_offset[i].reg_offset;
- data |= ((
arg &
reg_offset[i].bit_mask) << (16 + reg_offset[i].bit_offset));
+ data |= ((reg_offset[i].bit_mask) << (16 + reg_offset[i].bit_offset));
data |= ((arg & reg_offset[i].bit_mask) << reg_offset[i].bit_offset);
spin_lock_irqsave(&bank->slock, flags);
writel_relaxed(data, reg);