Skip to content

Commit 623fb99

Browse files
committed
Merge tag 'pinctrl-v6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij: - Fix the mt8189 register base name order back from being fixed broken - Add REGMAP_MMIO to the pic64gx-gpio2 to avoid build breakages - Mark the Qualcomm lpass-lpi pin controller GPIO chip instance as sleeping to fix lock splats - Update .mailmap with my new kernel.org address for all old mails after maintainers ran into issues with this * tag 'pinctrl-v6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: qcom: lpass-lpi: mark the GPIO controller as sleeping pinctrl: pic64gx-gpio2: Add REGMAP_MMIO dependency Update .mailmap for Linus Walleij pinctrl: mediatek: mt8189: restore previous register base name array order
2 parents 5572ad8 + ebc18e9 commit 623fb99

4 files changed

Lines changed: 7 additions & 2 deletions

File tree

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,10 @@ Linas Vepstas <[email protected]>
473473
474474
475475
476+
477+
478+
479+
476480
477481
478482

drivers/pinctrl/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ config PINCTRL_PIC64GX
491491
depends on ARCH_MICROCHIP || COMPILE_TEST
492492
depends on OF
493493
select GENERIC_PINCONF
494+
select REGMAP_MMIO
494495
default y
495496
help
496497
This selects the pinctrl driver for gpio2 on pic64gx.

drivers/pinctrl/mediatek/pinctrl-mt8189.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1642,7 +1642,7 @@ static const struct mtk_pin_reg_calc mt8189_reg_cals[PINCTRL_PIN_REG_MAX] = {
16421642
};
16431643

16441644
static const char * const mt8189_pinctrl_register_base_names[] = {
1645-
"base", "lm", "rb0", "rb1", "bm0", "bm1", "bm2", "lt0", "lt1", "rt",
1645+
"base", "bm0", "bm1", "bm2", "lm", "lt0", "lt1", "rb0", "rb1", "rt",
16461646
};
16471647

16481648
static const struct mtk_eint_hw mt8189_eint_hw = {

drivers/pinctrl/qcom/pinctrl-lpass-lpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ int lpi_pinctrl_probe(struct platform_device *pdev)
498498
pctrl->chip.base = -1;
499499
pctrl->chip.ngpio = data->npins;
500500
pctrl->chip.label = dev_name(dev);
501-
pctrl->chip.can_sleep = false;
501+
pctrl->chip.can_sleep = true;
502502

503503
mutex_init(&pctrl->lock);
504504

0 commit comments

Comments
 (0)