From patchwork Tue Mar 26 15:57:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10871475 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C8D8F1575 for ; Tue, 26 Mar 2019 15:57:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B25092858F for ; Tue, 26 Mar 2019 15:57:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A42BD285DA; Tue, 26 Mar 2019 15:57:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F38A2858F for ; Tue, 26 Mar 2019 15:57:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731599AbfCZP5s (ORCPT ); Tue, 26 Mar 2019 11:57:48 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:41087 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731570AbfCZP5k (ORCPT ); Tue, 26 Mar 2019 11:57:40 -0400 Received: by mail-wr1-f67.google.com with SMTP id r4so7304757wrq.8 for ; Tue, 26 Mar 2019 08:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oFSbPR6gZ80NJT0kvphV1uF3Ic6xnPJohJygHS7zRgQ=; b=aOyyfHUdTD+0/C9sDYB9DC3OSZ8vRYaurmgBJITGhusdwLsJ+dzzvg8NJz9IDzsEKa DPDRv1KfS3coVpzetOLZg95go1aCY7GmwKWqc31K3ocNQGJepodvoncJjGWy06H4kcYp 9Gb71Rqh5Jzcn6fNi7A9BMsmFFNtDoUO2m6b2YMHBLlGa66B3BQCm5EtYI7BtytV5tD/ 3SyhpzCfA0ggyUSgzWpQO6TxliKpXsB0t+jOoFREzmuzEpLMHsWAp5i4fDxYVyutvgCB xpWXqq/4SvYmGf02ysXCWU12RYuHrRr+qaZiSDwOXAWrdm/3XrIn00HOcdMfIjXCk34q IoOw== 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:mime-version:content-transfer-encoding; bh=oFSbPR6gZ80NJT0kvphV1uF3Ic6xnPJohJygHS7zRgQ=; b=KqMFUIkY8hc9iMqEDrIWWZO5PbMSDm8gqpDKPovuvUXqtg5J6Vklew9ukuQ7gYx5px /8wODxFB9wzO+/86mnerBPI/ZL8RIjn2DMNCPPI0YR7T0hOjsVL/UfoEaXm3eURbXRag MBrqIr6njVh7BdWdAGKa6TbwIeQAUqlZYY9cGLfQyPlHMXcJpGy3mvI2Ubb6zzuFTKnd q1pp3rBJycD8JT9UtJMcAR4w9wZOrc9e7Z9qJC8kYa0CWH0ddbR5bX63k++OdadA+b+J U17Ddv46tdYUKbm5wn9t/QBYMKcDk+c1VBZt86X1Ka9orQrMGrYGyl3wNez28rUrSouy n1AA== X-Gm-Message-State: APjAAAW3SzFJRjBIHL5shivlajpB3wPDfB8r97hvkoPkgL3hok4EQVd0 rSjpUub1174loLaUp6eh15jmzQ== X-Google-Smtp-Source: APXvYqyOFnJbEHiLStnWxm6A9moQpJBYz65AYo7mBV9PirflEkXMHvaAZxVw5xKdY8jUrFUkgHxdVA== X-Received: by 2002:adf:f8c1:: with SMTP id f1mr21129403wrq.151.1553615859235; Tue, 26 Mar 2019 08:57:39 -0700 (PDT) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id 204sm28522999wmc.1.2019.03.26.08.57.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 08:57:38 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Alan Stern , Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 3/3] usb: ohci-da8xx: drop the vbus GPIO Date: Tue, 26 Mar 2019 16:57:28 +0100 Message-Id: <20190326155728.5432-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326155728.5432-1-brgl@bgdev.pl> References: <20190326155728.5432-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski All users now setup a fixed regulator for the vbus supply. We can drop the vbus GPIO code. We need to modify the over-current interrupt handler to use a threaded irq as we cannot disable a regulator from interrupt context. Signed-off-by: Bartosz Golaszewski --- drivers/usb/host/ohci-da8xx.c | 39 ++++++++++++++++------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c index ca8a94f15ac0..f3892034de58 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c @@ -41,7 +41,6 @@ struct da8xx_ohci_hcd { struct regulator *vbus_reg; struct notifier_block nb; unsigned int reg_enabled; - struct gpio_desc *vbus_gpio; struct gpio_desc *oc_gpio; }; @@ -92,11 +91,6 @@ static int ohci_da8xx_set_power(struct usb_hcd *hcd, int on) struct device *dev = hcd->self.controller; int ret; - if (da8xx_ohci->vbus_gpio) { - gpiod_set_value_cansleep(da8xx_ohci->vbus_gpio, on); - return 0; - } - if (!da8xx_ohci->vbus_reg) return 0; @@ -124,9 +118,6 @@ static int ohci_da8xx_get_power(struct usb_hcd *hcd) { struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd); - if (da8xx_ohci->vbus_gpio) - return gpiod_get_value_cansleep(da8xx_ohci->vbus_gpio); - if (da8xx_ohci->vbus_reg) return regulator_is_enabled(da8xx_ohci->vbus_reg); @@ -159,9 +150,6 @@ static int ohci_da8xx_has_set_power(struct usb_hcd *hcd) { struct da8xx_ohci_hcd *da8xx_ohci = to_da8xx_ohci(hcd); - if (da8xx_ohci->vbus_gpio) - return 1; - if (da8xx_ohci->vbus_reg) return 1; @@ -211,7 +199,16 @@ static irqreturn_t ohci_da8xx_oc_handler(int irq, void *data) struct da8xx_ohci_hcd *da8xx_ohci = data; if (gpiod_get_value(da8xx_ohci->oc_gpio)) - gpiod_set_value(da8xx_ohci->vbus_gpio, 0); + return IRQ_WAKE_THREAD; + + return IRQ_HANDLED; +} + +static irqreturn_t ohci_da8xx_oc_thread(int irq, void *data) +{ + struct da8xx_ohci_hcd *da8xx_ohci = data; + + regulator_disable(da8xx_ohci->vbus_reg); return IRQ_HANDLED; } @@ -424,11 +421,6 @@ static int ohci_da8xx_probe(struct platform_device *pdev) } } - da8xx_ohci->vbus_gpio = devm_gpiod_get_optional(dev, "vbus", - GPIOD_OUT_HIGH); - if (IS_ERR(da8xx_ohci->vbus_gpio)) - goto err; - da8xx_ohci->oc_gpio = devm_gpiod_get_optional(dev, "oc", GPIOD_IN); if (IS_ERR(da8xx_ohci->oc_gpio)) goto err; @@ -438,9 +430,14 @@ static int ohci_da8xx_probe(struct platform_device *pdev) if (oc_irq < 0) goto err; - error = devm_request_irq(dev, oc_irq, ohci_da8xx_oc_handler, - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, - "OHCI over-current indicator", da8xx_ohci); + error = devm_request_threaded_irq(dev, oc_irq, + ohci_da8xx_oc_handler, + ohci_da8xx_oc_thread, + IRQF_TRIGGER_RISING | + IRQF_TRIGGER_FALLING | + IRQF_ONESHOT, + "OHCI over-current indicator", + da8xx_ohci); if (error) goto err; }