tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blackfin: bfin_gpio: Use proper mask for comparing pfunc

Browse Source 
For BF537_FAMILY, when offset != 1, the mask is 1.
Thus add proper mask for comparing pfunc with function.

Also has small refactor for better readability.
In portmux_setup(), it looks odd having "pmux &= ~(3 << 1);"
while in current code we do pmux |= (function << offset);.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
This commit is contained in:
Sonic Zhang
2013-07-01 11:24:46 +08:00
committed by Steven Miao
parent 5e01dc7b26
commit f70de486b2
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/blackfin/kernel/bfin_gpio.c
+14 -9
View File
@@ -255,7 +255,7 @@ static int portmux_group_check(unsigned short per)
u16 ident = P_IDENT(per); u16 ident = P_IDENT(per);
u16 function = P_FUNCT2MUX(per); u16 function = P_FUNCT2MUX(per);
s8 offset = port_mux[ident]; s8 offset = port_mux[ident];
u16 m, pmux, pfunc; u16 m, pmux, pfunc, mask;
if (offset < 0) if (offset < 0)
return 0; return 0;
@@ -270,10 +270,12 @@ static int portmux_group_check(unsigned short per)
continue; continue;
if (offset == 1) if (offset == 1)
pfunc = (pmux >> offset) & 3; mask = 3;
else else
pfunc = (pmux >> offset) & 1; mask = 1;
if (pfunc != function) {
pfunc = (pmux >> offset) & mask;
if (pfunc != (function & mask)) {
pr_err("pin group conflict! request pin %d func %d conflict with pin %d func %d\n", pr_err("pin group conflict! request pin %d func %d conflict with pin %d func %d\n",
ident, function, m, pfunc); ident, function, m, pfunc);
return -EINVAL; return -EINVAL;
@@ -288,17 +290,20 @@ static void portmux_setup(unsigned short per)
u16 ident = P_IDENT(per); u16 ident = P_IDENT(per);
u16 function = P_FUNCT2MUX(per); u16 function = P_FUNCT2MUX(per);
s8 offset = port_mux[ident]; s8 offset = port_mux[ident];
u16 pmux; u16 pmux, mask;
if (offset == -1) if (offset == -1)
return; return;
pmux = bfin_read_PORT_MUX(); pmux = bfin_read_PORT_MUX();
if (offset != 1) if (offset == 1)
pmux &= ~(1 << offset); mask = 3;
else else
pmux &= ~(3 << 1); mask = 1;
pmux |= (function << offset);
pmux &= ~(mask << offset);
pmux |= ((function & mask) << offset);
bfin_write_PORT_MUX(pmux); bfin_write_PORT_MUX(pmux);
} }
#elif defined(CONFIG_BF54x) || defined(CONFIG_BF60x) #elif defined(CONFIG_BF54x) || defined(CONFIG_BF60x)