public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pinctrl: sx150x: rename 'reg_advance' to 'reg_advanced'

Browse source 
This matches the datasheets and is less confusing since the register
has nothing to with advancing anything.

Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Peter Rosin 2016-12-02 11:51:15 +01:00 • committed by Linus Walleij
parent 6c4ef627d8
commit c9d26f1aab
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/pinctrl/pinctrl-sx150x.c
View file

@ -60,7 +60,7 @@ struct sx150x_123_pri {
u8 reg_pld_table2; u8 reg_pld_table2;
u8 reg_pld_table3; u8 reg_pld_table3;
u8 reg_pld_table4; u8 reg_pld_table4;
u8 reg_advance; u8 reg_advanced;
}; };
struct sx150x_456_pri { struct sx150x_456_pri {
@ -70,7 +70,7 @@ struct sx150x_456_pri {
u8 reg_pld_table2; u8 reg_pld_table2;
u8 reg_pld_table3; u8 reg_pld_table3;
u8 reg_pld_table4; u8 reg_pld_table4;
u8 reg_advance; u8 reg_advanced;
}; };
struct sx150x_789_pri { struct sx150x_789_pri {
@ -170,7 +170,7 @@ static const struct sx150x_device_data sx1501q_device_data = {
.reg_pld_mode = 0x10, .reg_pld_mode = 0x10,
.reg_pld_table0 = 0x11, .reg_pld_table0 = 0x11,
.reg_pld_table2 = 0x13, .reg_pld_table2 = 0x13,
.reg_advance = 0xad, .reg_advanced = 0xad,
}, },
.ngpios = 4, .ngpios = 4,
.pins = sx150x_4_pins, .pins = sx150x_4_pins,
@ -193,7 +193,7 @@ static const struct sx150x_device_data sx1502q_device_data = {
.reg_pld_table2 = 0x13, .reg_pld_table2 = 0x13,
.reg_pld_table3 = 0x14, .reg_pld_table3 = 0x14,
.reg_pld_table4 = 0x15, .reg_pld_table4 = 0x15,
.reg_advance = 0xad, .reg_advanced = 0xad,
}, },
.ngpios = 8, .ngpios = 8,
.pins = sx150x_8_pins, .pins = sx150x_8_pins,
@ -216,7 +216,7 @@ static const struct sx150x_device_data sx1503q_device_data = {
.reg_pld_table2 = 0x26, .reg_pld_table2 = 0x26,
.reg_pld_table3 = 0x28, .reg_pld_table3 = 0x28,
.reg_pld_table4 = 0x2a, .reg_pld_table4 = 0x2a,
.reg_advance = 0xad, .reg_advanced = 0xad,
}, },
.ngpios = 16, .ngpios = 16,
.pins = sx150x_16_pins, .pins = sx150x_16_pins,
@ -280,7 +280,7 @@ static const struct sx150x_device_data sx1506q_device_data = {
.reg_pld_table2 = 0x26, .reg_pld_table2 = 0x26,
.reg_pld_table3 = 0x28, .reg_pld_table3 = 0x28,
.reg_pld_table4 = 0x2a, .reg_pld_table4 = 0x2a,
.reg_advance = 0xad, .reg_advanced = 0xad,
}, },
.ngpios = 16, .ngpios = 16,
.pins = sx150x_16_pins, .pins = sx150x_16_pins,
@ -900,7 +900,7 @@ static int sx150x_init_misc(struct sx150x_pinctrl *pctl)
value = SX150X_789_REG_MISC_AUTOCLEAR_OFF; value = SX150X_789_REG_MISC_AUTOCLEAR_OFF;
break; break;
case SX150X_456: case SX150X_456:
reg = pctl->data->pri.x456.reg_advance; reg = pctl->data->pri.x456.reg_advanced;
value = 0x00; value = 0x00;
/* /*
@ -911,7 +911,7 @@ static int sx150x_init_misc(struct sx150x_pinctrl *pctl)
return 0; return 0;
break; break;
case SX150X_123: case SX150X_123:
reg = pctl->data->pri.x123.reg_advance; reg = pctl->data->pri.x123.reg_advanced;
value = 0x00; value = 0x00;
break; break;
default: default:
@ -964,10 +964,10 @@ static int sx150x_regmap_reg_width(struct sx150x_pinctrl *pctl,
reg == data->pri.x789.reg_reset)) reg == data->pri.x789.reg_reset))
|| ||
(data->model == SX150X_123 && (data->model == SX150X_123 &&
reg == data->pri.x123.reg_advance) reg == data->pri.x123.reg_advanced)
|| ||
(data->model == SX150X_456 && (data->model == SX150X_456 &&
reg == data->pri.x456.reg_advance)) { reg == data->pri.x456.reg_advanced)) {
return 8; return 8;
} else { } else {
return data->ngpios; return data->ngpios;