aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/sh-pfc/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pinctrl/sh-pfc/core.c')
-rw-r--r--drivers/pinctrl/sh-pfc/core.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
index 1c8597cf57be..96b02246796a 100644
--- a/drivers/pinctrl/sh-pfc/core.c
+++ b/drivers/pinctrl/sh-pfc/core.c
@@ -98,8 +98,7 @@ int sh_pfc_get_pin_index(struct sh_pfc *pfc, unsigned int pin)
98 return -EINVAL; 98 return -EINVAL;
99} 99}
100 100
101static int sh_pfc_enum_in_range(pinmux_enum_t enum_id, 101static int sh_pfc_enum_in_range(u16 enum_id, const struct pinmux_range *r)
102 const struct pinmux_range *r)
103{ 102{
104 if (enum_id < r->begin) 103 if (enum_id < r->begin)
105 return 0; 104 return 0;
@@ -194,7 +193,7 @@ static void sh_pfc_write_config_reg(struct sh_pfc *pfc,
194 sh_pfc_write_raw_reg(mapped_reg, crp->reg_width, data); 193 sh_pfc_write_raw_reg(mapped_reg, crp->reg_width, data);
195} 194}
196 195
197static int sh_pfc_get_config_reg(struct sh_pfc *pfc, pinmux_enum_t enum_id, 196static int sh_pfc_get_config_reg(struct sh_pfc *pfc, u16 enum_id,
198 const struct pinmux_cfg_reg **crp, int *fieldp, 197 const struct pinmux_cfg_reg **crp, int *fieldp,
199 int *valuep) 198 int *valuep)
200{ 199{
@@ -238,10 +237,10 @@ static int sh_pfc_get_config_reg(struct sh_pfc *pfc, pinmux_enum_t enum_id,
238 return -EINVAL; 237 return -EINVAL;
239} 238}
240 239
241static int sh_pfc_mark_to_enum(struct sh_pfc *pfc, pinmux_enum_t mark, int pos, 240static int sh_pfc_mark_to_enum(struct sh_pfc *pfc, u16 mark, int pos,
242 pinmux_enum_t *enum_idp) 241 u16 *enum_idp)
243{ 242{
244 const pinmux_enum_t *data = pfc->info->gpio_data; 243 const u16 *data = pfc->info->gpio_data;
245 int k; 244 int k;
246 245
247 if (pos) { 246 if (pos) {
@@ -264,7 +263,7 @@ static int sh_pfc_mark_to_enum(struct sh_pfc *pfc, pinmux_enum_t mark, int pos,
264int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type) 263int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type)
265{ 264{
266 const struct pinmux_cfg_reg *cr = NULL; 265 const struct pinmux_cfg_reg *cr = NULL;
267 pinmux_enum_t enum_id; 266 u16 enum_id;
268 const struct pinmux_range *range; 267 const struct pinmux_range *range;
269 int in_range, pos, field, value; 268 int in_range, pos, field, value;
270 int ret; 269 int ret;