Commit 5739ffc1 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'intel-pinctrl-v5.12-2' of... 

Merge tag 'intel-pinctrl-v5.12-2' of gitolite.kernel.org:pub/scm/linux/kernel/git/pinctrl/intel into fixes

intel-pinctrl for v5.12-2

* Fix regression in GPIO numbering in size based Intel pin control drivers

The following is an automated git shortlog grouped by driver:

intel:
 -  Show the GPIO base calculation explicitly
parents d0f9f47c 77e14126

drivers/pinctrl/intel/pinctrl-intel.c

+2 −0
Original line number Diff line number Diff line
@@ -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;



		/*