summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2026-09-03 13:46:14 +0200
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>2026-09-03 15:42:32 +0200
commitc016587866e573fa8dff50c3bdae9734c4418099 (patch)
tree2279df2eb43b36e958b87c33fc2f931cf8dea92c
parentc824f2278af4e072ce7b796189af72315c195cf3 (diff)
downloadlinux-next-c016587866e573fa8dff50c3bdae9734c4418099.tar.gz
linux-next-c016587866e573fa8dff50c3bdae9734c4418099.zip
pinctrl: intel: Try to retrieve driver data for pure platform drivers
The Denverton pinctrl device can be instantiated by the Intel LPC driver as an MFD platform device named "denverton-pinctrl". On affected systems the platform device does not carry the INTC3000 ACPI match data itself. As a result, intel_pinctrl_probe_by_hid() fails to obtain the SoC data using device_get_match_data() and returns -ENODATA. This might be also true for other platforms that can be enumerated by ACPI _HID. Fix the above by trying the pure platform driver data in case the firmware node is not set or doesn't carry the necessary information. Reported-by: Radek Válko <rvalko@lipicko.cz> Closes: https://lore.kernel.org/r/20260827184259.32386-1-rvalko@lipicko.cz Tested-by: Radek Válko <rvalko@lipicko.cz> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-rw-r--r--drivers/pinctrl/intel/pinctrl-intel.c25
1 files changed, 22 insertions, 3 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 08790bff2951..1363301098d5 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -1702,13 +1702,32 @@ int intel_pinctrl_probe(struct platform_device *pdev,
}
EXPORT_SYMBOL_NS_GPL(intel_pinctrl_probe, "PINCTRL_INTEL");
+static const struct intel_pinctrl_soc_data *
+intel_pinctrl_get_soc_data_by_hid(const struct platform_device *pdev)
+{
+ const struct intel_pinctrl_soc_data *data;
+ const struct device *dev = &pdev->dev;
+ const struct platform_device_id *id;
+
+ data = device_get_match_data(dev);
+ if (data)
+ return data;
+
+ id = platform_get_device_id(pdev);
+ if (!id)
+ return ERR_PTR(-ENODEV);
+
+ data = (const struct intel_pinctrl_soc_data *)id->driver_data;
+ return data ?: ERR_PTR(-ENODATA);
+}
+
int intel_pinctrl_probe_by_hid(struct platform_device *pdev)
{
const struct intel_pinctrl_soc_data *data;
- data = device_get_match_data(&pdev->dev);
- if (!data)
- return -ENODATA;
+ data = intel_pinctrl_get_soc_data_by_hid(pdev);
+ if (IS_ERR(data))
+ return PTR_ERR(data);
return intel_pinctrl_probe(pdev, data);
}