On Fri, Sep 29, 2017 at 11:15:01AM +0100, Charles Keepax wrote: > From: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx> > > To prepare for adding support for muxing individual pins rename the > group member of the pinctrl_map_mux and pinctrl_setting_mux structs to > group_or_pin. > > Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx> > --- > include/linux/pinctrl/machine.h | 2 +- > 28 files changed, 59 insertions(+), 50 deletions(-) > diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h > index 7fa5d87190c2..ec58c3647eb8 100644 > --- a/include/linux/pinctrl/machine.h > +++ b/include/linux/pinctrl/machine.h > @@ -32,7 +32,7 @@ enum pinctrl_map_type { > * @function: the mux function to select for the group > */ > struct pinctrl_map_mux { > - const char *group; > + const char *group_or_pin; > const char *function; > }; One additional fix is required for PIN_MAP_MUX_GROUP in this file. Thanks, Charles -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html