Skip to contentSkip to conversation

pinctrl: intel: Show the GPIO base calculation explicitly

PATCH In review Andy Shevchenko 1 participant 2 messages Mar 8, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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 036e126c72eb ("pinctrl: intel: Split intel_pinctrl_add_padgroups() for better maintenance")

---
v2: added tag and Cc'ed to stable@ (Mika)

 drivers/pinctrl/intel/pinctrl-intel.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/pinctrl/intel/pinctrl-intel.c +2 -0
index 8085782cd8f9..7283203861ae 100644
@@ -1357,6 +1357,7 @@ static int intel_pinctrl_add_padgroups_by_gpps(struct intel_pinctrl *pctrl,
 				gpps[i].gpio_base = 0;
 				break;
 			case INTEL_GPIO_BASE_NOMAP:
+				break;
 			default:
 				break;
 		}
@@ -1393,6 +1394,7 @@ static int intel_pinctrl_add_padgroups_by_size(struct intel_pinctrl *pctrl,
 		gpps[i].size = min(gpp_size, npins);
 		npins -= gpps[i].size;
 
+		gpps[i].gpio_base = gpps[i].base;
 		gpps[i].padown_num = padown_num;
 
 		/*
Signature · 1 line
2.30.1
#1 lore raw
Quoted 7 lines · Andy Shevchenko

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.

Meanwhile pushed to my review and testing queue, thanks!

Quoted 32 lines
Fixes 036e126c72eb ("pinctrl: intel: Split intel_pinctrl_add_padgroups() for better maintenance")

---
v2: added tag and Cc'ed to stable@ (Mika)

 drivers/pinctrl/intel/pinctrl-intel.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/pinctrl/intel/pinctrl-intel.c +2 -0
index 8085782cd8f9..7283203861ae 100644
@@ -1357,6 +1357,7 @@ static int intel_pinctrl_add_padgroups_by_gpps(struct intel_pinctrl *pctrl,
 				gpps[i].gpio_base = 0;
 				break;
 			case INTEL_GPIO_BASE_NOMAP:
+				break;
 			default:
 				break;
 		}
@@ -1393,6 +1394,7 @@ static int intel_pinctrl_add_padgroups_by_size(struct intel_pinctrl *pctrl,
 		gpps[i].size = min(gpp_size, npins);
 		npins -= gpps[i].size;
 
+		gpps[i].gpio_base = gpps[i].base;
 		gpps[i].padown_num = padown_num;
 
 		/*
Signature · 1 line
2.30.1
Signature · 2 lines
With Best Regards,
Andy Shevchenko