2
0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00

Compare commits

...

5 Commits

Author SHA1 Message Date
Linus Torvalds
b6add54ba6 Pin control fixes for the v6.17 series:
- 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.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmisW9EACgkQQRCzN7AZ
 XXMfKQ//Vu/LjQ4ubaKIx+9E3hcXL3Na2NZ+pZfmaAoHBAwyrPXKDXHQl7y82LpP
 kOVqeocJNO0mbVopp9damekwWlfODVuDkBwI/eQpk8R+Z+PY8wuiXAf9bbypVsyr
 3Sf0BVbXy6mJr5FA/XUcgLsJr2VO2B9vHlpfKd6WApfBeFoxUM23k70u1R0jEwqA
 I3crpjNoEw1QgO0/bqDc12TBllF1vvF+PBER2XscFZcgOuLGaoLwbZGjjT/igzWj
 V3oiHbvaxPBkGMal+tZPoqHg1zSj90RRKu2RU7r2t21M19tjBdkqT1VYhgqZzzIm
 EKI6HmZIg2G+TwPzN24WQsFnbY5iy8hDqI5EYZ414A03Xeswh7z67C7AkWXmLhnX
 TRMbol4an0gQM79rY65Vj9Qx0DQ5mZ7MzZECMs2WN5+kjJP6vE4BODiyjEstOSMm
 ZRZardQPSXKF2UpsXuDXYjTSoiFSEP4RuA+d0owICLWMNXRdR3v21wEAD18/FSH9
 L0/BedQlgr/lE0jykk4rVT3R8T1w2B/XXzAWMJO9tNZEuLOWRMWXJ01HT/BzW75F
 vilRN4HlCrD2MtU5pkc9CSiYqqmw6OAjRgVB1Ip02CShhFYWk1Z+InlK67to2Nfz
 09RBrwetBFaYWmHTHFmQfKr4tyzmgNpvLJ/rH9pvq2JRorJf3a8=
 =UIco
 -----END PGP SIGNATURE-----

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

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
2025-08-25 10:44:48 -04:00
Lorenzo Bianconi
563fcd6475 pinctrl: airoha: Fix return value in pinconf callbacks
Pinctrl stack requires ENOTSUPP error code if the parameter is not
supported by the pinctrl driver. Fix the returned error code in pinconf
callbacks if the operation is not supported.

Fixes: 1c8ace2d07 ("pinctrl: airoha: Add support for EN7581 SoC")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/20250822-airoha-pinconf-err-val-fix-v1-1-87b4f264ced2@kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2025-08-22 15:08:58 +02:00
Randy Dunlap
a12946bef0 pinctrl: STMFX: add missing HAS_IOMEM dependency
When building on ARCH=um (which does not set HAS_IOMEM), kconfig
reports an unmet dependency caused by PINCTRL_STMFX. It selects
MFD_STMFX, which depends on HAS_IOMEM. To stop this warning,
PINCTRL_STMFX should also depend on HAS_IOMEM.

kconfig warning:
WARNING: unmet direct dependencies detected for MFD_STMFX
  Depends on [n]: HAS_IOMEM [=n] && I2C [=y] && OF [=y]
  Selected by [y]:
  - PINCTRL_STMFX [=y] && PINCTRL [=y] && I2C [=y] && OF_GPIO [=y]

Fixes: 1490d9f841 ("pinctrl: Add STMFX GPIO expander Pinctrl/GPIO driver")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Link: https://lore.kernel.org/20250815022721.1650885-1-rdunlap@infradead.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2025-08-22 08:34:30 +02:00
Mario Limonciello (AMD)
23800ad126 gpiolib: acpi: Add quirk for ASUS ProArt PX13
The ASUS ProArt PX13 has a spurious wakeup event from the touchpad
a few moments after entering hardware sleep.  This can be avoided
by preventing the touchpad from being a wake source.

Add to the wakeup ignore list.

Reported-by: Amit Chaudhari <amitchaudhari@mac.com>
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4482
Tested-by: Amit Chaudhari <amitchaudhari@mac.com>
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/20250814183430.3887973-1-superm1@kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2025-08-19 14:14:58 +02:00
Alexey Gladkov
bd7c231212 pinctrl: meson: Fix typo in device table macro
The typo when using the MODULE_DEVICE_TABLE macro was not noticeable
because the macro was defined only if the module was built as a separate
module.

Cc: Xianwei Zhao <xianwei.zhao@amlogic.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: linux-amlogic@lists.infradead.org
Cc: linux-gpio@vger.kernel.org
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202507220009.8HKbNP16-lkp@intel.com/
Signed-off-by: Alexey Gladkov <legion@kernel.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/e548b7761302defec15aa2098172eabb1ce1ad4a.1755170493.git.legion@kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2025-08-18 11:10:47 +02:00
4 changed files with 20 additions and 5 deletions

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 */
};

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

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;
}

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 = {