From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [3/3] usb: ohci-da8xx: drop the vbus GPIO From: Bartosz Golaszewski Message-Id: <20190326155728.5432-4-brgl@bgdev.pl> Date: Tue, 26 Mar 2019 16:57:28 +0100 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 List-ID: RnJvbTogQmFydG9zeiBHb2xhc3pld3NraSA8YmdvbGFzemV3c2tpQGJheWxpYnJlLmNvbT4KCkFs bCB1c2VycyBub3cgc2V0dXAgYSBmaXhlZCByZWd1bGF0b3IgZm9yIHRoZSB2YnVzIHN1cHBseS4g V2UgY2FuIGRyb3AKdGhlIHZidXMgR1BJTyBjb2RlLiBXZSBuZWVkIHRvIG1vZGlmeSB0aGUgb3Zl ci1jdXJyZW50IGludGVycnVwdApoYW5kbGVyIHRvIHVzZSBhIHRocmVhZGVkIGlycSBhcyB3ZSBj YW5ub3QgZGlzYWJsZSBhIHJlZ3VsYXRvciBmcm9tCmludGVycnVwdCBjb250ZXh0LgoKU2lnbmVk LW9mZi1ieTogQmFydG9zeiBHb2xhc3pld3NraSA8YmdvbGFzemV3c2tpQGJheWxpYnJlLmNvbT4K LS0tCiBkcml2ZXJzL3VzYi9ob3N0L29oY2ktZGE4eHguYyB8IDM5ICsrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMjEg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9zdC9vaGNpLWRhOHh4LmMg Yi9kcml2ZXJzL3VzYi9ob3N0L29oY2ktZGE4eHguYwppbmRleCBjYThhOTRmMTVhYzAuLmYzODky MDM0ZGU1OCAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvaG9zdC9vaGNpLWRhOHh4LmMKKysrIGIv ZHJpdmVycy91c2IvaG9zdC9vaGNpLWRhOHh4LmMKQEAgLTQxLDcgKzQxLDYgQEAgc3RydWN0IGRh OHh4X29oY2lfaGNkIHsKIAlzdHJ1Y3QgcmVndWxhdG9yICp2YnVzX3JlZzsKIAlzdHJ1Y3Qgbm90 aWZpZXJfYmxvY2sgbmI7CiAJdW5zaWduZWQgaW50IHJlZ19lbmFibGVkOwotCXN0cnVjdCBncGlv X2Rlc2MgKnZidXNfZ3BpbzsKIAlzdHJ1Y3QgZ3Bpb19kZXNjICpvY19ncGlvOwogfTsKIApAQCAt OTIsMTEgKzkxLDYgQEAgc3RhdGljIGludCBvaGNpX2RhOHh4X3NldF9wb3dlcihzdHJ1Y3QgdXNi X2hjZCAqaGNkLCBpbnQgb24pCiAJc3RydWN0IGRldmljZSAqZGV2ID0gaGNkLT5zZWxmLmNvbnRy b2xsZXI7CiAJaW50IHJldDsKIAotCWlmIChkYTh4eF9vaGNpLT52YnVzX2dwaW8pIHsKLQkJZ3Bp b2Rfc2V0X3ZhbHVlX2NhbnNsZWVwKGRhOHh4X29oY2ktPnZidXNfZ3Bpbywgb24pOwotCQlyZXR1 cm4gMDsKLQl9Ci0KIAlpZiAoIWRhOHh4X29oY2ktPnZidXNfcmVnKQogCQlyZXR1cm4gMDsKIApA QCAtMTI0LDkgKzExOCw2IEBAIHN0YXRpYyBpbnQgb2hjaV9kYTh4eF9nZXRfcG93ZXIoc3RydWN0 IHVzYl9oY2QgKmhjZCkKIHsKIAlzdHJ1Y3QgZGE4eHhfb2hjaV9oY2QgKmRhOHh4X29oY2kgPSB0 b19kYTh4eF9vaGNpKGhjZCk7CiAKLQlpZiAoZGE4eHhfb2hjaS0+dmJ1c19ncGlvKQotCQlyZXR1 cm4gZ3Bpb2RfZ2V0X3ZhbHVlX2NhbnNsZWVwKGRhOHh4X29oY2ktPnZidXNfZ3Bpbyk7Ci0KIAlp ZiAoZGE4eHhfb2hjaS0+dmJ1c19yZWcpCiAJCXJldHVybiByZWd1bGF0b3JfaXNfZW5hYmxlZChk YTh4eF9vaGNpLT52YnVzX3JlZyk7CiAKQEAgLTE1OSw5ICsxNTAsNiBAQCBzdGF0aWMgaW50IG9o Y2lfZGE4eHhfaGFzX3NldF9wb3dlcihzdHJ1Y3QgdXNiX2hjZCAqaGNkKQogewogCXN0cnVjdCBk YTh4eF9vaGNpX2hjZCAqZGE4eHhfb2hjaSA9IHRvX2RhOHh4X29oY2koaGNkKTsKIAotCWlmIChk YTh4eF9vaGNpLT52YnVzX2dwaW8pCi0JCXJldHVybiAxOwotCiAJaWYgKGRhOHh4X29oY2ktPnZi dXNfcmVnKQogCQlyZXR1cm4gMTsKIApAQCAtMjExLDcgKzE5OSwxNiBAQCBzdGF0aWMgaXJxcmV0 dXJuX3Qgb2hjaV9kYTh4eF9vY19oYW5kbGVyKGludCBpcnEsIHZvaWQgKmRhdGEpCiAJc3RydWN0 IGRhOHh4X29oY2lfaGNkICpkYTh4eF9vaGNpID0gZGF0YTsKIAogCWlmIChncGlvZF9nZXRfdmFs dWUoZGE4eHhfb2hjaS0+b2NfZ3BpbykpCi0JCWdwaW9kX3NldF92YWx1ZShkYTh4eF9vaGNpLT52 YnVzX2dwaW8sIDApOworCQlyZXR1cm4gSVJRX1dBS0VfVEhSRUFEOworCisJcmV0dXJuIElSUV9I QU5ETEVEOworfQorCitzdGF0aWMgaXJxcmV0dXJuX3Qgb2hjaV9kYTh4eF9vY190aHJlYWQoaW50 IGlycSwgdm9pZCAqZGF0YSkKK3sKKwlzdHJ1Y3QgZGE4eHhfb2hjaV9oY2QgKmRhOHh4X29oY2kg PSBkYXRhOworCisJcmVndWxhdG9yX2Rpc2FibGUoZGE4eHhfb2hjaS0+dmJ1c19yZWcpOwogCiAJ cmV0dXJuIElSUV9IQU5ETEVEOwogfQpAQCAtNDI0LDExICs0MjEsNiBAQCBzdGF0aWMgaW50IG9o Y2lfZGE4eHhfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkJfQogCX0KIAot CWRhOHh4X29oY2ktPnZidXNfZ3BpbyA9IGRldm1fZ3Bpb2RfZ2V0X29wdGlvbmFsKGRldiwgInZi dXMiLAotCQkJCQkJCUdQSU9EX09VVF9ISUdIKTsKLQlpZiAoSVNfRVJSKGRhOHh4X29oY2ktPnZi dXNfZ3BpbykpCi0JCWdvdG8gZXJyOwotCiAJZGE4eHhfb2hjaS0+b2NfZ3BpbyA9IGRldm1fZ3Bp b2RfZ2V0X29wdGlvbmFsKGRldiwgIm9jIiwgR1BJT0RfSU4pOwogCWlmIChJU19FUlIoZGE4eHhf b2hjaS0+b2NfZ3BpbykpCiAJCWdvdG8gZXJyOwpAQCAtNDM4LDkgKzQzMCwxNCBAQCBzdGF0aWMg aW50IG9oY2lfZGE4eHhfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkJaWYg KG9jX2lycSA8IDApCiAJCQlnb3RvIGVycjsKIAotCQllcnJvciA9IGRldm1fcmVxdWVzdF9pcnEo ZGV2LCBvY19pcnEsIG9oY2lfZGE4eHhfb2NfaGFuZGxlciwKLQkJCQlJUlFGX1RSSUdHRVJfUklT SU5HIHwgSVJRRl9UUklHR0VSX0ZBTExJTkcsCi0JCQkJIk9IQ0kgb3Zlci1jdXJyZW50IGluZGlj YXRvciIsIGRhOHh4X29oY2kpOworCQllcnJvciA9IGRldm1fcmVxdWVzdF90aHJlYWRlZF9pcnEo ZGV2LCBvY19pcnEsCisJCQkJCQkgIG9oY2lfZGE4eHhfb2NfaGFuZGxlciwKKwkJCQkJCSAgb2hj aV9kYTh4eF9vY190aHJlYWQsCisJCQkJCQkgIElSUUZfVFJJR0dFUl9SSVNJTkcgfAorCQkJCQkJ ICBJUlFGX1RSSUdHRVJfRkFMTElORyB8CisJCQkJCQkgIElSUUZfT05FU0hPVCwKKwkJCQkJCSAg Ik9IQ0kgb3Zlci1jdXJyZW50IGluZGljYXRvciIsCisJCQkJCQkgIGRhOHh4X29oY2kpOwogCQlp ZiAoZXJyb3IpCiAJCQlnb3RvIGVycjsKIAl9Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A253C43381 for ; Tue, 26 Mar 2019 15:58:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17A5420863 for ; Tue, 26 Mar 2019 15:58:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="G7ZgbHRs"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="aOyyfHUd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17A5420863 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=m0dB3+L9RSwuN7vZEdgJJGgMrF/ipuBlVyKCpIyVMHA=; b=G7ZgbHRsFvxrPh IXsx/V2AyGwicZgorICmrNv0C9fChksc0uDpsDzRi8C+pCHEhMElZToO+tvMqi5a4fvzWTsFaIRDN qvjQLCydqjivsRjICuZqHx41GRBwSCse9Eki3rmkoxM4lnA3eijjXomQU5v7Hc7uHRPzUDkUVdfqg CH6U65D75sEPzi/E3yfTF8Hs4bprSdZivHg60N6IXeTXgEZAiON0EdOC7NwvLz8/1Fo99KrpczliX dB6hny6a7Y+pwgGRPL66NExIKy8PidV7rDyssd0Yuqvltvvpj8Uwn5Ioq+6AuVPPqxn1li55T87Mh KpsWJ4duRfnoFAyAZDQw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8oSa-0000Za-Dl; Tue, 26 Mar 2019 15:57:56 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8oSN-0000LO-MZ for linux-arm-kernel@lists.infradead.org; Tue, 26 Mar 2019 15:57:45 +0000 Received: by mail-wr1-x441.google.com with SMTP id q1so15019104wrp.0 for ; Tue, 26 Mar 2019 08:57:42 -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=MccNZN/GvFyx2XrABR+baWHlkVIuXLeVKXUUfyEdANqe7l4q0FfKboogKpS42w+UyQ 7piVCs24fWg2MIWKZ+ySVbKJWEYlbznR+2usbYG9ISFXxdxKXLTs5QIzpfFKglHxA8fx BUZgh64b4Plz6EU3XoYyNro7MMdS6GEPDudysZWSTFCueEIPBhWEb8KoMnQ1EgkMclEx zoxa+aVWpLk5UbW8lmxuOFJadwryBUr6CEtTSPI/8Gele5zjBv7wPUjBMPN5k1RaYEUl cKeLgODdjIDAXudr+q/jd1Imj8thNxCUm96SCsOnsf/yAfdu0GNftloYNS0TasA8pItn uYhQ== X-Gm-Message-State: APjAAAXB9J/f59QqNmLP6N3V/eI2lK6RLskanPbO5X4gMn1m8+NKzFrr 3cV7f+Bcqddy7V4sg/Qko9V/9Q== 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190326_085743_733958_9A6B1A60 X-CRM114-Status: GOOD ( 14.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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; } -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D517C4360F for ; Tue, 26 Mar 2019 15:57:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E61D2070D for ; Tue, 26 Mar 2019 15:57:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="aOyyfHUd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731935AbfCZP5p (ORCPT ); Tue, 26 Mar 2019 11:57:45 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:34068 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731599AbfCZP5l (ORCPT ); Tue, 26 Mar 2019 11:57:41 -0400 Received: by mail-wr1-f65.google.com with SMTP id p10so15032135wrq.1 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=qtkTVY+YJ0U02/P10m4oqV7SrHjmZuqNc+sLaBHl+ttcxhlt+jo5ybj6KODZ1NgW+0 +BYqLB3TmecRmTr6eutaFFK4ImBLDUQR6eXvC2ibvdNS//yPrR2wpL64fObWQY8xs4fx 4p6PnQnraD2bNnl972nKilKTrmFh2CFUtNSz9dFYlBZE/5nXRhNVWu81mGlCancMqhv4 lZQCShnZg2NE7u1YUYtTaqDFP3A1K2LPo7GDdU7yJFZFjjyF6oJ2FT4VtxtTrc3/0E50 IUSmfEwA1E7D07UyzbjrKerNjKfDW1+MMvVlMxfmR1f+n0HL4iNmiCN9FqJ3NOBVBiWd 1jVg== X-Gm-Message-State: APjAAAWXdpJ1BOTNmKwPklHVZWR6f49ID/sF/hcj7XsxIkgpf1LrWzEa +VLIVElAd6FFGIOBNVy+ZPkdPqKCT18= 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 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; } -- 2.20.1