On Tue, Apr 28, 2015 at 4:24 PM, Ezequiel Garcia
<ezequiel.garcia@xxxxxxxxxx> wrote:
> Andrew,
>
> On 04/07/2015 04:44 PM, Andrew Bresticker wrote:
> [..]
>> +static int pistachio_pinmux_enable(struct pinctrl_dev *pctldev,
>> + unsigned func, unsigned group)
>> +{
>> + struct pistachio_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
>> + const struct pistachio_pin_group *pg = &pctl->groups[group];
>> + const struct pistachio_function *pf = &pctl->functions[func];
>> + struct pinctrl_gpio_range *range;
>> + unsigned int i;
>> + u32 val;
>> +
>> + if (pg->mux_reg > 0) {
>> + for (i = 0; i < ARRAY_SIZE(pg->mux_option); i++) {
>> + if (pg->mux_option[i] == func)
>> + break;
>> + }
>> + if (i == ARRAY_SIZE(pg->mux_option)) {
>> + dev_err(pctl->dev, "Cannot mux pin %u to function %u\n",
>> + group, func);
>> + return -EINVAL;
>> + }
>> +
>> + val = pctl_readl(pctl, pg->mux_reg);
>> + val &= ~(pg->mux_mask << pg->mux_shift);
>> + val |= i << pg->mux_shift;
>> + pctl_writel(pctl, val, pg->mux_reg);
>> +
>> + if (pf->scenarios) {
>> + for (i = 0; i < pf->nscenarios; i++) {
>> + if (pf->scenarios[i] == group)
>> + break;
>> + }
>> + if (WARN_ON(i == pf->nscenarios))
>> + return -EINVAL;
>> +
>> + val = pctl_readl(pctl, pf->scenario_reg);
>> + val &= ~(pf->scenario_mask << pf->scenario_shift);
>> + val |= i << pf->scenario_shift;
>> + pctl_writel(pctl, val, pf->scenario_reg);
>> + }
>> + }
>> +
>> + range = pinctrl_find_gpio_range_from_pin(pctl->pctldev, group);
>> + if (range)
>> + gpio_disable(gc_to_bank(range->gc), group - range->pin_base);
>> +
>
> If you plan to submit a v4, how about using "pg->pins" here instead of "group"?
>
> Using "group" relies on having the same numberspace for the group and the pin,
> and it'll break when introducing the RPU pinctrl.
Sure, will do.
-Andrew
