Skip to content

Input: soc_button_array: defer MSHW0040 probe until GPIO is ready #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zR-JB wants to merge 1 commit into
base: v6.19-surface-devel
Choose a base branch
from
+15 −1
Open

Input: soc_button_array: defer MSHW0040 probe until GPIO is ready #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion drivers/input/misc/soc_button_array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,13 +553,27 @@ static int soc_device_check_MSHW0040(struct device *dev)
{
acpi_handle handle = ACPI_HANDLE(dev);
bool exists;
int gpio, irq, error;

// check if OEM platform revision DSM call exists
exists = acpi_check_dsm(handle, &MSHW0040_DSM_UUID,
MSHW0040_DSM_REVISION,
BIT(MSHW0040_DSM_GET_OMPR));
if (!exists)
return -ENODEV;

return exists ? 0 : -ENODEV;
/*
* Explicitly check if the GPIO controller is ready. The generic
* button creation path deliberately ignores -EPROBE_DEFER because
* some Intel platforms expose virtual GPIO resources which never
* acquire a GPIO provider. MSHW0040, however, is expected to have
* a real power-button GPIO at index 0.
*/
error = soc_button_lookup_gpio(dev, 0, &gpio, &irq);
if (error == -EPROBE_DEFER)
return error;

return 0;
}

/*
Expand Down