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,5/6] ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx From: Bartosz Golaszewski Message-Id: <20190411093024.23555-6-brgl@bgdev.pl> Date: Thu, 11 Apr 2019 11:30:23 +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: RnJvbTogQmFydG9zeiBHb2xhc3pld3NraSA8YmdvbGFzemV3c2tpQGJheWxpYnJlLmNvbT4KCklu c3RlYWQgb2YgZGlyZWN0bHkgdXNpbmcgdGhlIHZidXMgR1BJTyB3ZSBzaG91bGQgbW9kZWwgaXQg YXMgYSBmaXhlZApyZWd1bGF0b3IuIEFkZCBhbGwgbmVjZXNzYXJ5IGZpeC11cHMgZm9yIHRoZSBy ZWd1bGF0b3IgdG8gYmUgcmVnaXN0ZXJlZAphbmQgY29uZmlndXJlIHRoZSB2YnVzIEdQSU8gYXMg aXRzIGVuYWJsZSBwaW4uCgpTaWduZWQtb2ZmLWJ5OiBCYXJ0b3N6IEdvbGFzemV3c2tpIDxiZ29s YXN6ZXdza2lAYmF5bGlicmUuY29tPgotLS0KIGFyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1k YTgzMC1ldm0uYyB8IDQ5ICsrKysrKysrKysrKysrKysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2Vk LCA0NiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gvYXJt L21hY2gtZGF2aW5jaS9ib2FyZC1kYTgzMC1ldm0uYyBiL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9i b2FyZC1kYTgzMC1ldm0uYwppbmRleCBlM2Q3NGU0M2M0N2QuLjUxYTg5MjcwMmUyNyAxMDA2NDQK LS0tIGEvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2JvYXJkLWRhODMwLWV2bS5jCisrKyBiL2FyY2gv YXJtL21hY2gtZGF2aW5jaS9ib2FyZC1kYTgzMC1ldm0uYwpAQCAtMjksNiArMjksNyBAQAogI2lu Y2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RhdGEvc3BpLWRhdmluY2kuaD4KICNpbmNsdWRlIDxsaW51 eC9wbGF0Zm9ybV9kYXRhL3VzYi1kYXZpbmNpLmg+CiAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1f ZGF0YS90aS1hZW1pZi5oPgorI2luY2x1ZGUgPGxpbnV4L3JlZ3VsYXRvci9maXhlZC5oPgogI2lu Y2x1ZGUgPGxpbnV4L3JlZ3VsYXRvci9tYWNoaW5lLmg+CiAjaW5jbHVkZSA8bGludXgvbnZtZW0t cHJvdmlkZXIuaD4KIApAQCAtNTMsMTUgKzU0LDUwIEBAIHN0YXRpYyBjb25zdCBzaG9ydCBkYTgz MF9ldm1fdXNiMTFfcGluc1tdID0gewogCS0xCiB9OwogCi1zdGF0aWMgc3RydWN0IGdwaW9kX2xv b2t1cF90YWJsZSBkYTgzMF9ldm1fdXNiX2dwaW9fbG9va3VwID0geworc3RhdGljIHN0cnVjdCBy ZWd1bGF0b3JfY29uc3VtZXJfc3VwcGx5IGRhODMwX2V2bV91c2Jfc3VwcGxpZXNbXSA9IHsKKwlS RUdVTEFUT1JfU1VQUExZKCJ2YnVzIiwgTlVMTCksCit9OworCitzdGF0aWMgc3RydWN0IHJlZ3Vs YXRvcl9pbml0X2RhdGEgZGE4MzBfZXZtX3VzYl92YnVzX2RhdGEgPSB7CisJLmNvbnN1bWVyX3N1 cHBsaWVzCT0gZGE4MzBfZXZtX3VzYl9zdXBwbGllcywKKwkubnVtX2NvbnN1bWVyX3N1cHBsaWVz CT0gQVJSQVlfU0laRShkYTgzMF9ldm1fdXNiX3N1cHBsaWVzKSwKK307CisKK3N0YXRpYyBzdHJ1 Y3QgZml4ZWRfdm9sdGFnZV9jb25maWcgZGE4MzBfZXZtX3VzYl92YnVzID0geworCS5zdXBwbHlf bmFtZQkJPSAidmJ1cyIsCisJLm1pY3Jvdm9sdHMJCT0gMzMwMDAwMDAsCisJLmluaXRfZGF0YQkJ PSAmZGE4MzBfZXZtX3VzYl92YnVzX2RhdGEsCit9OworCitzdGF0aWMgc3RydWN0IHBsYXRmb3Jt X2RldmljZSBkYTgzMF9ldm1fdXNiX3ZidXNfZGV2aWNlID0geworCS5uYW1lCQk9ICJyZWctZml4 ZWQtdm9sdGFnZSIsCisJLmlkCQk9IDAsCisJLmRldgkJPSB7CisJCS5wbGF0Zm9ybV9kYXRhID0g JmRhODMwX2V2bV91c2JfdmJ1cywKKwl9LAorfTsKKworc3RhdGljIHN0cnVjdCBncGlvZF9sb29r dXBfdGFibGUgZGE4MzBfZXZtX3VzYl9vY19ncGlvX2xvb2t1cCA9IHsKIAkuZGV2X2lkCQk9ICJv aGNpLWRhOHh4IiwKIAkudGFibGUgPSB7Ci0JCUdQSU9fTE9PS1VQKCJkYXZpbmNpX2dwaW8iLCBP Tl9CRF9VU0JfRFJWLCAidmJ1cyIsIDApLAogCQlHUElPX0xPT0tVUCgiZGF2aW5jaV9ncGlvIiwg T05fQkRfVVNCX09WQywgIm9jIiwgMCksCiAJCXsgfQogCX0sCiB9OwogCitzdGF0aWMgc3RydWN0 IGdwaW9kX2xvb2t1cF90YWJsZSBkYTgzMF9ldm1fdXNiX3ZidXNfZ3Bpb19sb29rdXAgPSB7CisJ LmRldl9pZAkJPSAicmVnLWZpeGVkLXZvbHRhZ2UuMCIsCisJLnRhYmxlID0geworCQlHUElPX0xP T0tVUCgiZGF2aW5jaV9ncGlvIiwgT05fQkRfVVNCX0RSViwgInZidXMiLCAwKSwKKwkJeyB9CisJ fSwKK307CisKK3N0YXRpYyBzdHJ1Y3QgZ3Bpb2RfbG9va3VwX3RhYmxlICpkYTgzMF9ldm1fdXNi X2dwaW9fbG9va3Vwc1tdID0geworCSZkYTgzMF9ldm1fdXNiX29jX2dwaW9fbG9va3VwLAorCSZk YTgzMF9ldm1fdXNiX3ZidXNfZ3Bpb19sb29rdXAsCit9OworCiBzdGF0aWMgc3RydWN0IGRhOHh4 X29oY2lfcm9vdF9odWIgZGE4MzBfZXZtX3VzYjExX3BkYXRhID0gewogCS8qIFRQUzIwNjUgc3dp dGNoIEAgNVYgKi8KIAkucG90cGd0CQk9ICgzICsgMSkgLyAyLAkvKiAzIG1zIG1heCAqLwpAQCAt NzYsNiArMTEyLDkgQEAgc3RhdGljIF9faW5pdCB2b2lkIGRhODMwX2V2bV91c2JfaW5pdCh2b2lk KQogCQlwcl93YXJuKCIlczogVVNCIFBIWSBDTEsgcmVnaXN0cmF0aW9uIGZhaWxlZDogJWRcbiIs CiAJCQlfX2Z1bmNfXywgcmV0KTsKIAorCWdwaW9kX2FkZF9sb29rdXBfdGFibGVzKGRhODMwX2V2 bV91c2JfZ3Bpb19sb29rdXBzLAorCQkJCUFSUkFZX1NJWkUoZGE4MzBfZXZtX3VzYl9ncGlvX2xv b2t1cHMpKTsKKwogCXJldCA9IGRhOHh4X3JlZ2lzdGVyX3VzYl9waHkoKTsKIAlpZiAocmV0KQog CQlwcl93YXJuKCIlczogVVNCIFBIWSByZWdpc3RyYXRpb24gZmFpbGVkOiAlZFxuIiwKQEAgLTEw MSw3ICsxNDAsMTEgQEAgc3RhdGljIF9faW5pdCB2b2lkIGRhODMwX2V2bV91c2JfaW5pdCh2b2lk KQogCQlyZXR1cm47CiAJfQogCi0JZ3Bpb2RfYWRkX2xvb2t1cF90YWJsZSgmZGE4MzBfZXZtX3Vz Yl9ncGlvX2xvb2t1cCk7CisJcmV0ID0gcGxhdGZvcm1fZGV2aWNlX3JlZ2lzdGVyKCZkYTgzMF9l dm1fdXNiX3ZidXNfZGV2aWNlKTsKKwlpZiAocmV0KSB7CisJCXByX3dhcm4oIiVzOiBVbmFibGUg dG8gcmVnaXN0ZXIgdGhlIHZidXMgc3VwcGx5XG4iLCBfX2Z1bmNfXyk7CisJCXJldHVybjsKKwl9 CiAKIAlyZXQgPSBkYTh4eF9yZWdpc3Rlcl91c2IxMSgmZGE4MzBfZXZtX3VzYjExX3BkYXRhKTsK IAlpZiAocmV0KQo= 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 888C2C10F14 for ; Thu, 11 Apr 2019 09:30:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F20221872 for ; Thu, 11 Apr 2019 09:30:54 +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="LKWFbZDw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726624AbfDKJah (ORCPT ); Thu, 11 Apr 2019 05:30:37 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:54390 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726106AbfDKJah (ORCPT ); Thu, 11 Apr 2019 05:30:37 -0400 Received: by mail-wm1-f67.google.com with SMTP id c1so5789264wml.4 for ; Thu, 11 Apr 2019 02:30:36 -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=gyAH0wiE/i5zzvDeE8RjO1VQwB5hV38XLhGYRf7RuPY=; b=LKWFbZDwyDIE9VBr6ZDku3pb8lR9hY4EYrV44XAhbR/fmjLWPCxnw3Krj21LVhqRTL YPBAPpxboZOOsae32hg1KEvxzNeEzuqgz9c7x2WtxgQdNFU/W1LE0/BOSOa0sYpDWQgr KNritHHpzh8a/BK7iC+SS49TfrsLKuEFHrrbEaVIcpoZ9OwdKd9Z4lHXWbGmSDLbDkYr 8+NVPjZVZHiCBz9JxBt7hcGe2hLlKeV3K99wlW0Nl3aRIN8lzhvXYY9xOSczTINuTBFx n2ubV4JS4+fDrLXAd+6t1kE2Gu6uX/d71iIwtW21xKzQ1hVjv6HPfwg2lBEhXCvsw3+4 LGbg== 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=gyAH0wiE/i5zzvDeE8RjO1VQwB5hV38XLhGYRf7RuPY=; b=eAotped4u9izX8ycKDS9jV3HkiR4Xyr52BOONoBNSS5fE73hosYsG4nNmRDLfrvF5H rBQfPuuqk+OOBMr/RBKpOEfz4oG0Z7DKejjkNlX3GZDjs2qDIFe/wKbXL52Se0VXEp2U GgYjDt1822QGgxbEEIeH1md4FnbEVywAd9JxL5F+pHY4YIvijckjWEtEygJx0jm3yFho 09QkUqS1Vfu9A682CFZTwMkYzRZzxhseBils4XRb4Z/XjouQnjx8669qI2i7HN5EnoHc 5enoNvenNvuI6nusugV7cXBlvVnHERCBHdhW+KJnNzCMJPvfPT3zOezD6i9qkP8sywb4 hZ/g== X-Gm-Message-State: APjAAAV4SFQJlGW0FjO0pVWqSU7pD+N+Ku9LYqIAn4w/Bt1Y5J6bQyjk RF2QYgbJD2W7m9+7gIVK4k9UTg== X-Google-Smtp-Source: APXvYqzArDrbBVSw7R46IuYWlEMH89mmBiFePh3BpDkGU+eWOvyfu00TsWGYAn256PJYMX5byeDLaQ== X-Received: by 2002:a1c:cf0b:: with SMTP id f11mr5794968wmg.26.1554975035679; Thu, 11 Apr 2019 02:30:35 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 02:30:35 -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 5/6] ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx Date: Thu, 11 Apr 2019 11:30:23 +0200 Message-Id: <20190411093024.23555-6-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: <20190411093023.Bg-DyVETCLzf9ULk0CIg_M0KX1iu_rNkE2lgbecFuSw@z> From: Bartosz Golaszewski Instead of directly using the vbus GPIO we should model it as a fixed regulator. Add all necessary fix-ups for the regulator to be registered and configure the vbus GPIO as its enable pin. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/board-da830-evm.c | 49 +++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index e3d74e43c47d..51a892702e27 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -53,15 +54,50 @@ static const short da830_evm_usb11_pins[] = { -1 }; -static struct gpiod_lookup_table da830_evm_usb_gpio_lookup = { +static struct regulator_consumer_supply da830_evm_usb_supplies[] = { + REGULATOR_SUPPLY("vbus", NULL), +}; + +static struct regulator_init_data da830_evm_usb_vbus_data = { + .consumer_supplies = da830_evm_usb_supplies, + .num_consumer_supplies = ARRAY_SIZE(da830_evm_usb_supplies), +}; + +static struct fixed_voltage_config da830_evm_usb_vbus = { + .supply_name = "vbus", + .microvolts = 33000000, + .init_data = &da830_evm_usb_vbus_data, +}; + +static struct platform_device da830_evm_usb_vbus_device = { + .name = "reg-fixed-voltage", + .id = 0, + .dev = { + .platform_data = &da830_evm_usb_vbus, + }, +}; + +static struct gpiod_lookup_table da830_evm_usb_oc_gpio_lookup = { .dev_id = "ohci-da8xx", .table = { - GPIO_LOOKUP("davinci_gpio", ON_BD_USB_DRV, "vbus", 0), GPIO_LOOKUP("davinci_gpio", ON_BD_USB_OVC, "oc", 0), { } }, }; +static struct gpiod_lookup_table da830_evm_usb_vbus_gpio_lookup = { + .dev_id = "reg-fixed-voltage.0", + .table = { + GPIO_LOOKUP("davinci_gpio", ON_BD_USB_DRV, "vbus", 0), + { } + }, +}; + +static struct gpiod_lookup_table *da830_evm_usb_gpio_lookups[] = { + &da830_evm_usb_oc_gpio_lookup, + &da830_evm_usb_vbus_gpio_lookup, +}; + static struct da8xx_ohci_root_hub da830_evm_usb11_pdata = { /* TPS2065 switch @ 5V */ .potpgt = (3 + 1) / 2, /* 3 ms max */ @@ -76,6 +112,9 @@ static __init void da830_evm_usb_init(void) pr_warn("%s: USB PHY CLK registration failed: %d\n", __func__, ret); + gpiod_add_lookup_tables(da830_evm_usb_gpio_lookups, + ARRAY_SIZE(da830_evm_usb_gpio_lookups)); + ret = da8xx_register_usb_phy(); if (ret) pr_warn("%s: USB PHY registration failed: %d\n", @@ -101,7 +140,11 @@ static __init void da830_evm_usb_init(void) return; } - gpiod_add_lookup_table(&da830_evm_usb_gpio_lookup); + ret = platform_device_register(&da830_evm_usb_vbus_device); + if (ret) { + pr_warn("%s: Unable to register the vbus supply\n", __func__); + return; + } ret = da8xx_register_usb11(&da830_evm_usb11_pdata); if (ret) -- 2.21.0