From patchwork Tue Oct 24 19:54:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 830022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MSVfIJve"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yM3vB5v0kz9sNx for ; Wed, 25 Oct 2017 06:56:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751775AbdJXTzq (ORCPT ); Tue, 24 Oct 2017 15:55:46 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:48960 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751719AbdJXTzl (ORCPT ); Tue, 24 Oct 2017 15:55:41 -0400 Received: by mail-qt0-f194.google.com with SMTP id f8so32009323qta.5; Tue, 24 Oct 2017 12:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+g4GxcALUyFwPMO/rm/fRWN/cK9+qiTaV9zKwdRfZEg=; b=MSVfIJve34oZtRvF8e7Q+1HYQ+/F9J3nFS4uqluU0qRmnIacJQ3f3Zl/QLG6t6xwNu XBTwXqgTXMac0Sw4G4hfkRBGtwyl2bslH3Jn3YxWiMgBC4thusz7e51P6DuOHfbkb2j1 /RUNuFesibWKf+m/7bJ1hncj1II5yjWv54CA/DZ2lt5r/d7unUAgEBqSP29qUoI/qPRy Ku8qswYbZXMKi+2C4xiokAe4f0Vea0tdYZx0K7iOgbeJQ6Pa/endmR1D+xdZiAg5HK62 TIQp+WnghxqvJzsn08TRNZiBEHhVYdsgLDULEXjdotMO0UhmpwS1W0FIRza3JW/E0c/Q +IXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+g4GxcALUyFwPMO/rm/fRWN/cK9+qiTaV9zKwdRfZEg=; b=dO2Url/BEYe57BwQGDYIgHUOGWesDG+uCipnEPr4ykCOHqzMUPv38JqwTXQZoO9mZS bYtz4hZHyBZR50YBW38SBpTix7IzEZQ4ZXJoG8l9WUNAdFPmXDctkZM1rhs15I5+TOnz Ik4ykmYSardqKekwS09/nWuP5IYmmCGA0cQoKRm1AIXoYE8s12E6dd/aT/Fgm6OkQTD3 sVvLOpmZbYnjv2gAaOo21rZcnEt0kYYOqMuAMNFB9/8dQkHwVCUCfHEkXCBKMgE4ubMg rubTTON/mx/AegHVBSKMXOmYJGKY8/XQioLsDsx+8zjXD7+biibWZnatwMGzT+cxN22I M3jA== X-Gm-Message-State: AMCzsaVrgP03i4T/qGd9l3Va/AR8rCHmLHPe0sHZWHbGAjCtuHtQt7Ua YvKq7uq7QiOdCN0lM35d5O0= X-Google-Smtp-Source: ABhQp+T3aQXn8udVM8h13Pa8vWqYSFbljHjLIprXelGbcCkWstEFeK0QhYVJZ0aJvkUsjt/UthJQKA== X-Received: by 10.200.43.252 with SMTP id n57mr26494845qtn.141.1508874940647; Tue, 24 Oct 2017 12:55:40 -0700 (PDT) Received: from stb-bld-02.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id s27sm794249qtj.3.2017.10.24.12.55.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Oct 2017 12:55:40 -0700 (PDT) From: Doug Berger To: Gregory Fong Cc: Doug Berger , Linus Walleij , Brian Norris , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/7] gpio: brcmstb: allow all instances to be wakeup sources Date: Tue, 24 Oct 2017 12:54:46 -0700 Message-Id: <20171024195451.30535-3-opendmb@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171024195451.30535-1-opendmb@gmail.com> References: <20171024195451.30535-1-opendmb@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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: 19a7b6940b78 ("gpio: brcmstb: Add interrupt and wakeup source support") Signed-off-by: Doug Berger Reviewed-by: Florian Fainelli Acked-by: Gregory Fong --- drivers/gpio/gpio-brcmstb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 9b8fcca7ad17..2031b73e066c 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -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 * modify it under the terms of the GNU General Public License as @@ -47,7 +47,6 @@ struct brcmstb_gpio_priv { struct platform_device *pdev; int parent_irq; int gpio_base; - bool can_wake; int parent_wake_irq; 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 */ 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")) { priv->parent_wake_irq = platform_get_irq(pdev, 1); if (priv->parent_wake_irq < 0) { + priv->parent_wake_irq = 0; dev_warn(dev, "Couldn't get wake IRQ - GPIOs will not be able to wake from sleep"); } else { @@ -364,8 +364,9 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev, device_set_wakeup_capable(dev, true); device_wakeup_enable(dev); err = devm_request_irq(dev, priv->parent_wake_irq, - brcmstb_gpio_wake_irq_handler, 0, - "brcmstb-gpio-wake", priv); + brcmstb_gpio_wake_irq_handler, + IRQF_SHARED, + "brcmstb-gpio-wake", priv); if (err < 0) { 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 = brcmstb_gpio_reboot; 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; err = gpiochip_irqchip_add(&bank->gc, &bank->irq_chip, 0,