projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pinctrl-v6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[linux-2.6-microblaze.git]
/
drivers
/
pinctrl
/
starfive
/
pinctrl-starfive-jh7110.c
diff --git
a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
index
6de11a4
..
9609eb1
100644
(file)
--- a/
drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
+++ b/
drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
@@
-307,7
+307,7
@@
static int jh7110_set_mux(struct pinctrl_dev *pctldev,
return -EINVAL;
pinmux = group->data;
return -EINVAL;
pinmux = group->data;
- for (i = 0; i < group->
num_
pins; i++) {
+ for (i = 0; i < group->
grp.n
pins; i++) {
u32 v = pinmux[i];
if (info->jh7110_set_one_pin_mux)
u32 v = pinmux[i];
if (info->jh7110_set_one_pin_mux)
@@
-437,7
+437,7
@@
static int jh7110_pinconf_group_get(struct pinctrl_dev *pctldev,
if (!group)
return -EINVAL;
if (!group)
return -EINVAL;
- return jh7110_pinconf_get(pctldev, group->pins[0], config);
+ return jh7110_pinconf_get(pctldev, group->
grp.
pins[0], config);
}
static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev,
}
static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev,
@@
-508,8
+508,8
@@
static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev,
}
}
}
}
- for (i = 0; i < group->
num_
pins; i++)
- jh7110_padcfg_rmw(sfp, group->pins[i], mask, value);
+ for (i = 0; i < group->
grp.n
pins; i++)
+ jh7110_padcfg_rmw(sfp, group->
grp.
pins[i], mask, value);
return 0;
}
return 0;
}