breeze/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-01-25 15:03:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'pinctrl-v6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Browse Source 
Pull pin control fixes from Linus Walleij:

 - Module macro parameter fix for the meson driver so that it actually
   modprobes

 - ACPI quirk for the ASUS ProArt PX13

 - Build dependency for the STMFX driver

 - Proper return value for the pinconf callbacks in the Airhoa driver

* tag 'pinctrl-v6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: airoha: Fix return value in pinconf callbacks
  pinctrl: STMFX: add missing HAS_IOMEM dependency
  gpiolib: acpi: Add quirk for ASUS ProArt PX13
  pinctrl: meson: Fix typo in device table macro
This commit is contained in:
Linus Torvalds
2025-08-25 10:44:48 -04:00
parent 1b237f190e 563fcd6475
commit b6add54ba6
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpio/gpiolib-acpi-quirks.c
View File

@@ -344,6 +344,20 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] __initconst = {
.ignore_interrupt = "AMDI0030:00@8",
},
},
{
/*
* Spurious wakeups from TP_ATTN# pin
* Found in BIOS 5.35
* https://gitlab.freedesktop.org/drm/amd/-/issues/4482
*/
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_FAMILY, "ProArt PX13"),
},
.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
.ignore_wake = "ASCP1A00:00@8",
},
},
{} /* Terminating entry */
};

1
drivers/pinctrl/Kconfig
View File

@@ -539,6 +539,7 @@ config PINCTRL_STMFX
tristate "STMicroelectronics STMFX GPIO expander pinctrl driver"
depends on I2C
depends on OF_GPIO
depends on HAS_IOMEM
select GENERIC_PINCONF
select GPIOLIB_IRQCHIP
select MFD_STMFX

8
drivers/pinctrl/mediatek/pinctrl-airoha.c
View File

@@ -2696,7 +2696,7 @@ static int airoha_pinconf_get(struct pinctrl_dev *pctrl_dev,
arg = 1;
break;
default:
return -EOPNOTSUPP;
return -ENOTSUPP;
}
*config = pinconf_to_config_packed(param, arg);
@@ -2788,7 +2788,7 @@ static int airoha_pinconf_set(struct pinctrl_dev *pctrl_dev,
break;
}
default:
return -EOPNOTSUPP;
return -ENOTSUPP;
}
}
@@ -2805,10 +2805,10 @@ static int airoha_pinconf_group_get(struct pinctrl_dev *pctrl_dev,
if (airoha_pinconf_get(pctrl_dev,
airoha_pinctrl_groups[group].pins[i],
config))
return -EOPNOTSUPP;
return -ENOTSUPP;
if (i && cur_config != *config)
return -EOPNOTSUPP;
return -ENOTSUPP;
cur_config = *config;
}

2
drivers/pinctrl/meson/pinctrl-amlogic-a4.c
View File

@@ -1093,7 +1093,7 @@ static const struct of_device_id aml_pctl_of_match[] = {
{ .compatible = "amlogic,pinctrl-s6", .data = &s6_priv_data, },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, aml_pctl_dt_match);
MODULE_DEVICE_TABLE(of, aml_pctl_of_match);
static struct platform_driver aml_pctl_driver = {
.driver = {