summaryrefslogtreecommitdiff
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2021-03-11 03:08:50 +0300
committerLinus Walleij <linus.walleij@linaro.org>2021-03-11 03:08:50 +0300
commit5739ffc10d047d190bf53a6dddbf5e5a9c94c373 (patch)
tree3dcd61158e4f328cb1914acf63cac7219a12bf62 /drivers/pinctrl
parentd0f9f47c07fe52b34e2ff8590cf09e0a9d8d6f99 (diff)
parent77e141266c8e72e4a586fe42eaab1b4b047655ed (diff)
downloadlinux-5739ffc10d047d190bf53a6dddbf5e5a9c94c373.tar.xz
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
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/intel/pinctrl-intel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 8085782cd8f9..7283203861ae 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -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;
/*