Commit 4426be36 authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

pinctrl: intel: Switch to to embedded struct pingroup 



Since struct intel_pingroup got a new member, switch the driver to use it.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 98c23f60

drivers/pinctrl/intel/pinctrl-intel.c

+7 −7
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static const char *intel_get_group_name(struct pinctrl_dev *pctldev, 
{

	struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);



	return pctrl->soc->groups[group].name;

	return pctrl->soc->groups[group].grp.name;

}



static int intel_get_group_pins(struct pinctrl_dev *pctldev, unsigned int group,
@@ -287,8 +287,8 @@ static int intel_get_group_pins(struct pinctrl_dev *pctldev, unsigned int group, 
{

	struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);



	*pins = pctrl->soc->groups[group].pins;

	*npins = pctrl->soc->groups[group].npins;

	*pins = pctrl->soc->groups[group].grp.pins;

	*npins = pctrl->soc->groups[group].grp.npins;

	return 0;

}
@@ -391,19 +391,19 @@ static int intel_pinmux_set_mux(struct pinctrl_dev *pctldev, 
	 * All pins in the groups needs to be accessible and writable

	 * before we can enable the mux for this group.

	 */

	for (i = 0; i < grp->npins; i++) {

		if (!intel_pad_usable(pctrl, grp->pins[i])) {

	for (i = 0; i < grp->grp.npins; i++) {

		if (!intel_pad_usable(pctrl, grp->grp.pins[i])) {

			raw_spin_unlock_irqrestore(&pctrl->lock, flags);

			return -EBUSY;

		}

	}



	/* Now enable the mux setting for each pin in the group */

	for (i = 0; i < grp->npins; i++) {

	for (i = 0; i < grp->grp.npins; i++) {

		void __iomem *padcfg0;

		u32 value;



		padcfg0 = intel_get_padcfg(pctrl, grp->pins[i], PADCFG0);

		padcfg0 = intel_get_padcfg(pctrl, grp->grp.pins[i], PADCFG0);

		value = readl(padcfg0);



		value &= ~PADCFG0_PMODE_MASK;