hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gpio: brcmstb: allow all instances to be wakeup sources 

This commit allows a wakeup parent interrupt to be shared between
instances.

It also removes the redundant can_wake member of the private data
structure by using whether the parent_wake_irq has been defined to
indicate that the GPIO device can wake.

Fixes: 19a7b6940b ("gpio: brcmstb: Add interrupt and wakeup source support")
Signed-off-by: Doug Berger <opendmb@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Gregory Fong <gregory.0xf0@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Doug Berger 2017-10-24 12:54:46 -07:00 committed by Linus Walleij
parent 5ac9d2df5b
commit 0752df6611
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpio/gpio-brcmstb.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2015 Broadcom Corporation * Copyright (C) 2015-2017 Broadcom
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@ -47,7 +47,6 @@ struct brcmstb_gpio_priv {
struct platform_device *pdev; struct platform_device *pdev;
int parent_irq; int parent_irq;
int gpio_base; int gpio_base;
bool can_wake;
int parent_wake_irq; int parent_wake_irq;
struct notifier_block reboot_notifier; struct notifier_block reboot_notifier;
}; };
@ -349,10 +348,11 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
/* Ensures that all non-wakeup IRQs are disabled at suspend */ /* Ensures that all non-wakeup IRQs are disabled at suspend */
bank->irq_chip.flags = IRQCHIP_MASK_ON_SUSPEND; bank->irq_chip.flags = IRQCHIP_MASK_ON_SUSPEND;
if (IS_ENABLED(CONFIG_PM_SLEEP) && !priv->can_wake && if (IS_ENABLED(CONFIG_PM_SLEEP) && !priv->parent_wake_irq &&
of_property_read_bool(np, "wakeup-source")) { of_property_read_bool(np, "wakeup-source")) {
priv->parent_wake_irq = platform_get_irq(pdev, 1); priv->parent_wake_irq = platform_get_irq(pdev, 1);
if (priv->parent_wake_irq < 0) { if (priv->parent_wake_irq < 0) {
priv->parent_wake_irq = 0;
dev_warn(dev, dev_warn(dev,
"Couldn't get wake IRQ - GPIOs will not be able to wake from sleep"); "Couldn't get wake IRQ - GPIOs will not be able to wake from sleep");
} else { } else {
@ -364,8 +364,9 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
device_set_wakeup_capable(dev, true); device_set_wakeup_capable(dev, true);
device_wakeup_enable(dev); device_wakeup_enable(dev);
err = devm_request_irq(dev, priv->parent_wake_irq, err = devm_request_irq(dev, priv->parent_wake_irq,
brcmstb_gpio_wake_irq_handler, 0, brcmstb_gpio_wake_irq_handler,
"brcmstb-gpio-wake", priv); IRQF_SHARED,
"brcmstb-gpio-wake", priv);
if (err < 0) { if (err < 0) {
dev_err(dev, "Couldn't request wake IRQ"); dev_err(dev, "Couldn't request wake IRQ");
@ -375,11 +376,10 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
priv->reboot_notifier.notifier_call = priv->reboot_notifier.notifier_call =
brcmstb_gpio_reboot; brcmstb_gpio_reboot;
register_reboot_notifier(&priv->reboot_notifier); register_reboot_notifier(&priv->reboot_notifier);
priv->can_wake = true;
} }
} }
if (priv->can_wake) if (priv->parent_wake_irq)
bank->irq_chip.irq_set_wake = brcmstb_gpio_irq_set_wake; bank->irq_chip.irq_set_wake = brcmstb_gpio_irq_set_wake;
err = gpiochip_irqchip_add(&bank->gc, &bank->irq_chip, 0, err = gpiochip_irqchip_add(&bank->gc, &bank->irq_chip, 0,