Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0752df66 authored by Doug Berger's avatar Doug Berger Committed by Linus Walleij
Browse files

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: 19a7b694 ("gpio: brcmstb: Add interrupt and wakeup source support")
Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarGregory Fong <gregory.0xf0@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5ac9d2df

drivers/gpio/gpio-brcmstb.c

+7 −7
Original line number Original line Diff line number Diff line 
/*

/*

 * 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,7 +364,8 @@ 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,

					       IRQF_SHARED,

					       "brcmstb-gpio-wake", priv);

					       "brcmstb-gpio-wake", priv);





			if (err < 0) {

			if (err < 0) {
@@ -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,