Skip to content

platform/surface: aggregator: Defer probe while the wakeup GPIO is unavailable #182

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

Closed
CmdrShepardsPie wants to merge 1 commit into from
Closed

platform/surface: aggregator: Defer probe while the wakeup GPIO is unavailable #182

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: 12 additions & 4 deletions drivers/platform/surface/aggregator/controller.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2753,12 +2753,20 @@ int ssam_irq_setup(struct ssam_controller *ctrl)
*/
const int irqf = IRQF_ONESHOT | IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN;

gpiod = gpiod_get(dev, "ssam_wakeup-int", GPIOD_ASIS);
if (IS_ERR(gpiod)) {
irq = fwnode_irq_get(dev_fwnode(dev), 0);
} else {
/*
* Only fall back to the fwnode IRQ if no wakeup GPIO is described at
* all. Any other error, in particular -EPROBE_DEFER while the GPIO
* controller has not been registered yet, must reach the probe.
*/
gpiod = gpiod_get_optional(dev, "ssam_wakeup-int", GPIOD_ASIS);
if (IS_ERR(gpiod))
return PTR_ERR(gpiod);

if (gpiod) {
irq = gpiod_to_irq(gpiod);
gpiod_put(gpiod);
} else {
irq = fwnode_irq_get(dev_fwnode(dev), 0);
}

if (irq < 0)
Expand Down