Skip to content

Commit 77e1412

Browse files
committed
pinctrl: intel: Show the GPIO base calculation explicitly
During the split of intel_pinctrl_add_padgroups(), the _by_size() variant missed the GPIO base calculations and hence made unable to retrieve proper GPIO number. Assign the gpio_base explicitly in _by_size() variant. While at it, differentiate NOMAP case with the rest in _by_gpps() variant. Fixes: 036e126 ("pinctrl: intel: Split intel_pinctrl_add_padgroups() for better maintenance") Reported-and-tested-by: Maximilian Luz <luzmaximilian@gmail.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
1 parent a38fd87 commit 77e1412

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/pinctrl/intel/pinctrl-intel.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,6 +1357,7 @@ static int intel_pinctrl_add_padgroups_by_gpps(struct intel_pinctrl *pctrl,
13571357
gpps[i].gpio_base = 0;
13581358
break;
13591359
case INTEL_GPIO_BASE_NOMAP:
1360+
break;
13601361
default:
13611362
break;
13621363
}
@@ -1393,6 +1394,7 @@ static int intel_pinctrl_add_padgroups_by_size(struct intel_pinctrl *pctrl,
13931394
gpps[i].size = min(gpp_size, npins);
13941395
npins -= gpps[i].size;
13951396

1397+
gpps[i].gpio_base = gpps[i].base;
13961398
gpps[i].padown_num = padown_num;
13971399

13981400
/*

0 commit comments

Comments
 (0)