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: [v4,6/6] usb: ohci-da8xx: drop the vbus GPIO From: Bartosz Golaszewski Message-Id: <20190411093024.23555-7-brgl@bgdev.pl> Date: Thu, 11 Apr 2019 11:30:24 +0200 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 V2UgY2FuIGRyb3AKdGhlIHZidXMgR1BJTyBjb2RlLgoKU2lnbmVkLW9mZi1ieTogQmFydG9zeiBH b2xhc3pld3NraSA8YmdvbGFzemV3c2tpQGJheWxpYnJlLmNvbT4KQWNrZWQtYnk6IEFsYW4gU3Rl cm4gPHN0ZXJuQHJvd2xhbmQuaGFydmFyZC5lZHU+Ci0tLQogZHJpdmVycy91c2IvaG9zdC9vaGNp LWRhOHh4LmMgfCAyMSArLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxIGlu c2VydGlvbigrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9z dC9vaGNpLWRhOHh4LmMgYi9kcml2ZXJzL3VzYi9ob3N0L29oY2ktZGE4eHguYwppbmRleCA2MTU4 NDA4YjFlYTAuLjY3NDY0MWM5NGM5ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvaG9zdC9vaGNp LWRhOHh4LmMKKysrIGIvZHJpdmVycy91c2IvaG9zdC9vaGNpLWRhOHh4LmMKQEAgLTQwLDcgKzQw LDYgQEAgc3RydWN0IGRhOHh4X29oY2lfaGNkIHsKIAlzdHJ1Y3QgcGh5ICp1c2IxMV9waHk7CiAJ c3RydWN0IHJlZ3VsYXRvciAqdmJ1c19yZWc7CiAJc3RydWN0IG5vdGlmaWVyX2Jsb2NrIG5iOwot CXN0cnVjdCBncGlvX2Rlc2MgKnZidXNfZ3BpbzsKIAlzdHJ1Y3QgZ3Bpb19kZXNjICpvY19ncGlv OwogfTsKIApAQCAtOTEsMTEgKzkwLDYgQEAgc3RhdGljIGludCBvaGNpX2RhOHh4X3NldF9wb3dl cihzdHJ1Y3QgdXNiX2hjZCAqaGNkLCBpbnQgb24pCiAJc3RydWN0IGRldmljZSAqZGV2ID0gaGNk LT5zZWxmLmNvbnRyb2xsZXI7CiAJaW50IHJldDsKIAotCWlmIChkYTh4eF9vaGNpLT52YnVzX2dw aW8pIHsKLQkJZ3Bpb2Rfc2V0X3ZhbHVlX2NhbnNsZWVwKGRhOHh4X29oY2ktPnZidXNfZ3Bpbywg b24pOwotCQlyZXR1cm4gMDsKLQl9Ci0KIAlpZiAoIWRhOHh4X29oY2ktPnZidXNfcmVnKQogCQly ZXR1cm4gMDsKIApAQCAtMTIwLDkgKzExNCw2IEBAIHN0YXRpYyBpbnQgb2hjaV9kYTh4eF9nZXRf cG93ZXIoc3RydWN0IHVzYl9oY2QgKmhjZCkKIHsKIAlzdHJ1Y3QgZGE4eHhfb2hjaV9oY2QgKmRh OHh4X29oY2kgPSB0b19kYTh4eF9vaGNpKGhjZCk7CiAKLQlpZiAoZGE4eHhfb2hjaS0+dmJ1c19n cGlvKQotCQlyZXR1cm4gZ3Bpb2RfZ2V0X3ZhbHVlX2NhbnNsZWVwKGRhOHh4X29oY2ktPnZidXNf Z3Bpbyk7Ci0KIAlpZiAoZGE4eHhfb2hjaS0+dmJ1c19yZWcpCiAJCXJldHVybiByZWd1bGF0b3Jf aXNfZW5hYmxlZChkYTh4eF9vaGNpLT52YnVzX3JlZyk7CiAKQEAgLTE1NSw5ICsxNDYsNiBAQCBz dGF0aWMgaW50IG9oY2lfZGE4eHhfaGFzX3NldF9wb3dlcihzdHJ1Y3QgdXNiX2hjZCAqaGNkKQog ewogCXN0cnVjdCBkYTh4eF9vaGNpX2hjZCAqZGE4eHhfb2hjaSA9IHRvX2RhOHh4X29oY2koaGNk KTsKIAotCWlmIChkYTh4eF9vaGNpLT52YnVzX2dwaW8pCi0JCXJldHVybiAxOwotCiAJaWYgKGRh OHh4X29oY2ktPnZidXNfcmVnKQogCQlyZXR1cm4gMTsKIApAQCAtMjA5LDkgKzE5Nyw3IEBAIHN0 YXRpYyBpcnFyZXR1cm5fdCBvaGNpX2RhOHh4X29jX3RocmVhZChpbnQgaXJxLCB2b2lkICpkYXRh KQogCWludCByZXQ7CiAKIAlpZiAoZ3Bpb2RfZ2V0X3ZhbHVlX2NhbnNsZWVwKGRhOHh4X29oY2kt Pm9jX2dwaW8pKSB7Ci0JCWlmIChkYTh4eF9vaGNpLT52YnVzX2dwaW8pIHsKLQkJCWdwaW9kX3Nl dF92YWx1ZV9jYW5zbGVlcChkYTh4eF9vaGNpLT52YnVzX2dwaW8sIDApOwotCQl9IGVsc2UgaWYg KGRhOHh4X29oY2ktPnZidXNfcmVnKSB7CisJCWlmIChkYTh4eF9vaGNpLT52YnVzX3JlZykgewog CQkJcmV0ID0gcmVndWxhdG9yX2Rpc2FibGUoZGE4eHhfb2hjaS0+dmJ1c19yZWcpOwogCQkJaWYg KHJldCkKIAkJCQlkZXZfZXJyKGRldiwKQEAgLTQzMiwxMSArNDE4LDYgQEAgc3RhdGljIGludCBv aGNpX2RhOHh4X3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJCX0KIAl9CiAK LQlkYTh4eF9vaGNpLT52YnVzX2dwaW8gPSBkZXZtX2dwaW9kX2dldF9vcHRpb25hbChkZXYsICJ2 YnVzIiwKLQkJCQkJCQlHUElPRF9PVVRfSElHSCk7Ci0JaWYgKElTX0VSUihkYTh4eF9vaGNpLT52 YnVzX2dwaW8pKQotCQlnb3RvIGVycjsKLQogCWRhOHh4X29oY2ktPm9jX2dwaW8gPSBkZXZtX2dw aW9kX2dldF9vcHRpb25hbChkZXYsICJvYyIsIEdQSU9EX0lOKTsKIAlpZiAoSVNfRVJSKGRhOHh4 X29oY2ktPm9jX2dwaW8pKQogCQlnb3RvIGVycjsK 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=-8.9 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 4F103C10F13 for ; Thu, 11 Apr 2019 09:30:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B43A20850 for ; Thu, 11 Apr 2019 09:30:52 +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="LlyzkDPY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727177AbfDKJar (ORCPT ); Thu, 11 Apr 2019 05:30:47 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39494 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727105AbfDKJai (ORCPT ); Thu, 11 Apr 2019 05:30:38 -0400 Received: by mail-wr1-f68.google.com with SMTP id j9so6376102wrn.6 for ; Thu, 11 Apr 2019 02:30:37 -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=GEMwZ7dACVPBfzPjV5lUAEHUp2v66lOC+jNy0RoKMOY=; b=LlyzkDPYBbaZhaZxDaCJQeEcRJlsiMK88jKOOYPHgM4JHgEAMT4mXUIzyQ4bGj/Sho HPL+a898sCKZQFA3IkjD8+Tg0UXsxgqVymMXWuakC1Xa6dk7F8Oni4qVjc5FsCT1UBSL UDXgxaYCostRpOyFVQYM5l3mJ5IWlZLLFfHEPD7m0rNDIvw7t8pygFYCx+ExK93cggyE ZgMRZteuozoCHXFz0u97rjYaLukxANYOREJNMzFABXsUV12i1tQEgEa3HJ5gzYhVfYk2 ToSma/VCEARgw+B7FrjK+FNXa6LHzwlXtwuCHrE1kFxwbBSkIbUQYqijq/NykWbxEj5M vInw== 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=GEMwZ7dACVPBfzPjV5lUAEHUp2v66lOC+jNy0RoKMOY=; b=o2GnNumJUhWA0EMXbKAUV1s/EajCCOzEvRKVzHyVoTjhjpxzYJcjjYiX23lKrc2Zn4 gwREqincLY3doGZ11lNA4SJdpD+PUQWdW6G6KX1sX4M6QVFyBrcfSocJt9cp/NYSKi54 UBE6UY59y9peWsI9JcRKidrcJorcOTIju5neQP0NBcBEQ9V4+y1bMAWx7atU2z+TWl0z Wkkm7fHtE5O6yKp02pRbikrSDsH4yHC/0/qVz3DFdEFiVRXwzCuWbSUoKTlQgYvaMHMl VilR+S9V56Prhnpk3SLk5YKuUpYX8g3caG+KXsbMbOd5f4nw2qgKPm8kaKkmNePaN278 Q94w== X-Gm-Message-State: APjAAAWqMwCiQcYYmnHsktz0Qp21jKxcl/KmEpioQfZ5TF0NbbVGanZe Kq/H29Bvaud0+oZRzReiHLJZxQ== X-Google-Smtp-Source: APXvYqzCqKZqTCUAbmAkyBuRWTsPX7ZNDJpnNQwb4R31fGKGfvuHcm/TQXGa4undHOlTqs9Fw2CNog== X-Received: by 2002:adf:e449:: with SMTP id t9mr29387776wrm.204.1554975036963; Thu, 11 Apr 2019 02:30:36 -0700 (PDT) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id a9sm37517228wrt.29.2019.04.11.02.30.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 02:30:36 -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 v4 6/6] usb: ohci-da8xx: drop the vbus GPIO Date: Thu, 11 Apr 2019 11:30:24 +0200 Message-Id: <20190411093024.23555-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190411093024.23555-1-brgl@bgdev.pl> References: <20190411093024.23555-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID: <20190411093024.oyaCqP4cdQRYtts7KlwyzmZ7CQnkzKF_8yqQN79N4BU@z> From: Bartosz Golaszewski All users now setup a fixed regulator for the vbus supply. We can drop the vbus GPIO code. Signed-off-by: Bartosz Golaszewski Acked-by: Alan Stern --- drivers/usb/host/ohci-da8xx.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c index 6158408b1ea0..674641c94c9e 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c @@ -40,7 +40,6 @@ struct da8xx_ohci_hcd { struct phy *usb11_phy; struct regulator *vbus_reg; struct notifier_block nb; - struct gpio_desc *vbus_gpio; struct gpio_desc *oc_gpio; }; @@ -91,11 +90,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; @@ -120,9 +114,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); @@ -155,9 +146,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; @@ -209,9 +197,7 @@ static irqreturn_t ohci_da8xx_oc_thread(int irq, void *data) int ret; if (gpiod_get_value_cansleep(da8xx_ohci->oc_gpio)) { - if (da8xx_ohci->vbus_gpio) { - gpiod_set_value_cansleep(da8xx_ohci->vbus_gpio, 0); - } else if (da8xx_ohci->vbus_reg) { + if (da8xx_ohci->vbus_reg) { ret = regulator_disable(da8xx_ohci->vbus_reg); if (ret) dev_err(dev, @@ -432,11 +418,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; -- 2.21.0