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: [v5,4/6] ARM: davinci: omapl138-hawk: add a fixed regulator for ohci-da8xx From: Bartosz Golaszewski Message-Id: <20190412123640.11437-5-brgl@bgdev.pl> Date: Fri, 12 Apr 2019 14:36:38 +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 YXN6ZXdza2lAYmF5bGlicmUuY29tPgotLS0KIGFyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1v bWFwbDEzOC1oYXdrLmMgfCA0OSArKysrKysrKysrKysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2Vk LCA0NiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gvYXJt L21hY2gtZGF2aW5jaS9ib2FyZC1vbWFwbDEzOC1oYXdrLmMgYi9hcmNoL2FybS9tYWNoLWRhdmlu Y2kvYm9hcmQtb21hcGwxMzgtaGF3ay5jCmluZGV4IGUyNDRjODY0ODU5NC4uZGIxNzdhNmE3ZTQ4 IDEwMDY0NAotLS0gYS9hcmNoL2FybS9tYWNoLWRhdmluY2kvYm9hcmQtb21hcGwxMzgtaGF3ay5j CisrKyBiL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1vbWFwbDEzOC1oYXdrLmMKQEAgLTIx LDYgKzIxLDcgQEAKICNpbmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kYXRhL210ZC1kYXZpbmNpLmg+ CiAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGF0YS9tdGQtZGF2aW5jaS1hZW1pZi5oPgogI2lu Y2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RhdGEvdGktYWVtaWYuaD4KKyNpbmNsdWRlIDxsaW51eC9y ZWd1bGF0b3IvZml4ZWQuaD4KICNpbmNsdWRlIDxsaW51eC9yZWd1bGF0b3IvbWFjaGluZS5oPgog CiAjaW5jbHVkZSA8YXNtL21hY2gtdHlwZXMuaD4KQEAgLTI5OCwxNSArMjk5LDUwIEBAIHN0YXRp YyBjb25zdCBzaG9ydCBkYTg1MF9oYXdrX3VzYjExX3BpbnNbXSA9IHsKIAktMQogfTsKIAotc3Rh dGljIHN0cnVjdCBncGlvZF9sb29rdXBfdGFibGUgaGF3a191c2JfZ3Bpb19sb29rdXAgPSB7Citz dGF0aWMgc3RydWN0IHJlZ3VsYXRvcl9jb25zdW1lcl9zdXBwbHkgaGF3a191c2Jfc3VwcGxpZXNb XSA9IHsKKwlSRUdVTEFUT1JfU1VQUExZKCJ2YnVzIiwgTlVMTCksCit9OworCitzdGF0aWMgc3Ry dWN0IHJlZ3VsYXRvcl9pbml0X2RhdGEgaGF3a191c2JfdmJ1c19kYXRhID0geworCS5jb25zdW1l cl9zdXBwbGllcwk9IGhhd2tfdXNiX3N1cHBsaWVzLAorCS5udW1fY29uc3VtZXJfc3VwcGxpZXMJ PSBBUlJBWV9TSVpFKGhhd2tfdXNiX3N1cHBsaWVzKSwKK307CisKK3N0YXRpYyBzdHJ1Y3QgZml4 ZWRfdm9sdGFnZV9jb25maWcgaGF3a191c2JfdmJ1cyA9IHsKKwkuc3VwcGx5X25hbWUJCT0gInZi dXMiLAorCS5taWNyb3ZvbHRzCQk9IDMzMDAwMDAsCisJLmluaXRfZGF0YQkJPSAmaGF3a191c2Jf dmJ1c19kYXRhLAorfTsKKworc3RhdGljIHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgaGF3a191c2Jf dmJ1c19kZXZpY2UgPSB7CisJLm5hbWUJCT0gInJlZy1maXhlZC12b2x0YWdlIiwKKwkuaWQJCT0g MCwKKwkuZGV2CQk9IHsKKwkJLnBsYXRmb3JtX2RhdGEgPSAmaGF3a191c2JfdmJ1cywKKwl9LAor fTsKKworc3RhdGljIHN0cnVjdCBncGlvZF9sb29rdXBfdGFibGUgaGF3a191c2Jfb2NfZ3Bpb19s b29rdXAgPSB7CiAJLmRldl9pZAkJPSAib2hjaS1kYTh4eCIsCiAJLnRhYmxlID0gewotCQlHUElP X0xPT0tVUCgiZGF2aW5jaV9ncGlvIiwgREE4NTBfVVNCMV9WQlVTX1BJTiwgInZidXMiLCAwKSwK IAkJR1BJT19MT09LVVAoImRhdmluY2lfZ3BpbyIsIERBODUwX1VTQjFfT0NfUElOLCAib2MiLCAw KSwKIAkJeyB9CiAJfSwKIH07CiAKK3N0YXRpYyBzdHJ1Y3QgZ3Bpb2RfbG9va3VwX3RhYmxlIGhh d2tfdXNiX3ZidXNfZ3Bpb19sb29rdXAgPSB7CisJLmRldl9pZAkJPSAicmVnLWZpeGVkLXZvbHRh Z2UuMCIsCisJLnRhYmxlID0geworCQlHUElPX0xPT0tVUCgiZGF2aW5jaV9ncGlvIiwgREE4NTBf VVNCMV9WQlVTX1BJTiwgTlVMTCwgMCksCisJCXsgfQorCX0sCit9OworCitzdGF0aWMgc3RydWN0 IGdwaW9kX2xvb2t1cF90YWJsZSAqaGF3a191c2JfZ3Bpb19sb29rdXBzW10gPSB7CisJJmhhd2tf dXNiX29jX2dwaW9fbG9va3VwLAorCSZoYXdrX3VzYl92YnVzX2dwaW9fbG9va3VwLAorfTsKKwog c3RhdGljIHN0cnVjdCBkYTh4eF9vaGNpX3Jvb3RfaHViIG9tYXBsMTM4X2hhd2tfdXNiMTFfcGRh dGEgPSB7CiAJLyogVFBTMjA4NyBzd2l0Y2ggQCA1ViAqLwogCS5wb3RwZ3QgICAgICAgICA9ICgz ICsgMSkgLyAyLCAgLyogMyBtcyBtYXggKi8KQEAgLTMyNywxMiArMzYzLDE5IEBAIHN0YXRpYyBf X2luaXQgdm9pZCBvbWFwbDEzOF9oYXdrX3VzYl9pbml0KHZvaWQpCiAJCXByX3dhcm4oIiVzOiBV U0IgUEhZIENMSyByZWdpc3RyYXRpb24gZmFpbGVkOiAlZFxuIiwKIAkJCV9fZnVuY19fLCByZXQp OwogCisJZ3Bpb2RfYWRkX2xvb2t1cF90YWJsZXMoaGF3a191c2JfZ3Bpb19sb29rdXBzLAorCQkJ CUFSUkFZX1NJWkUoaGF3a191c2JfZ3Bpb19sb29rdXBzKSk7CisKIAlyZXQgPSBkYTh4eF9yZWdp c3Rlcl91c2JfcGh5KCk7CiAJaWYgKHJldCkKIAkJcHJfd2FybigiJXM6IFVTQiBQSFkgcmVnaXN0 cmF0aW9uIGZhaWxlZDogJWRcbiIsCiAJCQlfX2Z1bmNfXywgcmV0KTsKIAotCWdwaW9kX2FkZF9s b29rdXBfdGFibGUoJmhhd2tfdXNiX2dwaW9fbG9va3VwKTsKKwlyZXQgPSBwbGF0Zm9ybV9kZXZp Y2VfcmVnaXN0ZXIoJmhhd2tfdXNiX3ZidXNfZGV2aWNlKTsKKwlpZiAocmV0KSB7CisJCXByX3dh cm4oIiVzOiBVbmFibGUgdG8gcmVnaXN0ZXIgdGhlIHZidXMgc3VwcGx5XG4iLCBfX2Z1bmNfXyk7 CisJCXJldHVybjsKKwl9CiAKIAlyZXQgPSBkYTh4eF9yZWdpc3Rlcl91c2IxMSgmb21hcGwxMzhf aGF3a191c2IxMV9wZGF0YSk7CiAJaWYgKHJldCkK 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,URIBL_BLOCKED,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 708DBC282CE for ; Fri, 12 Apr 2019 12:36:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F1CB2082E for ; Fri, 12 Apr 2019 12:36:53 +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="o8ep84Q2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728589AbfDLMgv (ORCPT ); Fri, 12 Apr 2019 08:36:51 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39411 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728479AbfDLMgu (ORCPT ); Fri, 12 Apr 2019 08:36:50 -0400 Received: by mail-wm1-f66.google.com with SMTP id n25so10822044wmk.4 for ; Fri, 12 Apr 2019 05:36:48 -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=WkiOzqo+5E8+PTnExhJYSKG8TC17kxUDe5ZrFElD/ZE=; b=o8ep84Q2/ISktCjQUU+vyYVsFjv1uyAK6SwCYaD4jFPEo1k0bqeNPAX2jydpt0quHY bdNKR/nqe+T1MnRzAEgttYd8HKmhNU6RmqlSVrBFkF3Tuw0l03zBIUjHbg43TaV5Bclb LSZgulopBXIDgJMrb5b5UIBko9QP9OAbuYNHmFH8NO3bBAbI/mTQAO6m5neAmfWsoa4Q fMBh0U+4dVQn9lxZ5mzervhRl1oNb0j+HvJWs60pSM11dqXvjmxNPElY5dcp0ZlWTiRd sYmPyrrlZu/xWk2pKs7wnczZPF6P5kLTlH4bDO9xGuiZaEhXj733gUATOFKZD2W3qU+A /rtQ== 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=WkiOzqo+5E8+PTnExhJYSKG8TC17kxUDe5ZrFElD/ZE=; b=XuC0Phpxd8o/CU3AwfQ2pL3wbXztTc2R0zkmLL0hHFIBYhaeH5EXXNXD9wvTPfTRwU mHVaCKZvLxIItXv+Rq09z+rbm2Dftm469u9xkD4VAtkSbwmBb1HPWpvIfaIchM7Eq6ta PxeNzgVPIX/7VYyJj8fD+KIh/MW7Few7Q231opN4wO/oPBtAFEx1dFXiApcppRqtIcwZ lsabLOTC761v+AhBzB/TJyWQ4nOQKTQ5MIdiJUhXfAe2ZM1c/hfGdl1VE3BqwSICrlQo zI+QsAvi1UYv/A8Ujgy4fnsyW1kc9lm9aUpbmL/N6fiw2+B+1AvL2t5Pi5wIXkv9dIfl i1RA== X-Gm-Message-State: APjAAAU3PqPp/tGzyXprmdEzI/hLs27yj4bPMv3WisZTY9c4yYve0hiL eJ5rbgO+33Eeuuzie8re1RXeWw== X-Google-Smtp-Source: APXvYqzzQFHewKkSvNQ7QQk9hjqwJsoMiX45q4ONdF3ZP0biYEW/amEcQzL4GiM88Y5pcvpDlAVuKQ== X-Received: by 2002:a1c:730c:: with SMTP id d12mr11021693wmb.47.1555072608151; Fri, 12 Apr 2019 05:36:48 -0700 (PDT) Received: from localhost.localdomain (aputeaux-684-1-35-248.w90-86.abo.wanadoo.fr. [90.86.90.248]) by smtp.gmail.com with ESMTPSA id v190sm12384030wme.18.2019.04.12.05.36.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 05:36:47 -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 v5 4/6] ARM: davinci: omapl138-hawk: add a fixed regulator for ohci-da8xx Date: Fri, 12 Apr 2019 14:36:38 +0200 Message-Id: <20190412123640.11437-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190412123640.11437-1-brgl@bgdev.pl> References: <20190412123640.11437-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: <20190412123638.EXfoCOtNi25Gd2ZvVJkaONXXkbvRz8M7oXCdX7JLF3c@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-omapl138-hawk.c | 49 +++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index e244c8648594..db177a6a7e48 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -298,15 +299,50 @@ static const short da850_hawk_usb11_pins[] = { -1 }; -static struct gpiod_lookup_table hawk_usb_gpio_lookup = { +static struct regulator_consumer_supply hawk_usb_supplies[] = { + REGULATOR_SUPPLY("vbus", NULL), +}; + +static struct regulator_init_data hawk_usb_vbus_data = { + .consumer_supplies = hawk_usb_supplies, + .num_consumer_supplies = ARRAY_SIZE(hawk_usb_supplies), +}; + +static struct fixed_voltage_config hawk_usb_vbus = { + .supply_name = "vbus", + .microvolts = 3300000, + .init_data = &hawk_usb_vbus_data, +}; + +static struct platform_device hawk_usb_vbus_device = { + .name = "reg-fixed-voltage", + .id = 0, + .dev = { + .platform_data = &hawk_usb_vbus, + }, +}; + +static struct gpiod_lookup_table hawk_usb_oc_gpio_lookup = { .dev_id = "ohci-da8xx", .table = { - GPIO_LOOKUP("davinci_gpio", DA850_USB1_VBUS_PIN, "vbus", 0), GPIO_LOOKUP("davinci_gpio", DA850_USB1_OC_PIN, "oc", 0), { } }, }; +static struct gpiod_lookup_table hawk_usb_vbus_gpio_lookup = { + .dev_id = "reg-fixed-voltage.0", + .table = { + GPIO_LOOKUP("davinci_gpio", DA850_USB1_VBUS_PIN, NULL, 0), + { } + }, +}; + +static struct gpiod_lookup_table *hawk_usb_gpio_lookups[] = { + &hawk_usb_oc_gpio_lookup, + &hawk_usb_vbus_gpio_lookup, +}; + static struct da8xx_ohci_root_hub omapl138_hawk_usb11_pdata = { /* TPS2087 switch @ 5V */ .potpgt = (3 + 1) / 2, /* 3 ms max */ @@ -327,12 +363,19 @@ static __init void omapl138_hawk_usb_init(void) pr_warn("%s: USB PHY CLK registration failed: %d\n", __func__, ret); + gpiod_add_lookup_tables(hawk_usb_gpio_lookups, + ARRAY_SIZE(hawk_usb_gpio_lookups)); + ret = da8xx_register_usb_phy(); if (ret) pr_warn("%s: USB PHY registration failed: %d\n", __func__, ret); - gpiod_add_lookup_table(&hawk_usb_gpio_lookup); + ret = platform_device_register(&hawk_usb_vbus_device); + if (ret) { + pr_warn("%s: Unable to register the vbus supply\n", __func__); + return; + } ret = da8xx_register_usb11(&omapl138_hawk_usb11_pdata); if (ret) -- 2.21.0 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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 06FD3C10F0E for ; Fri, 12 Apr 2019 12:37:35 +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 A3F2C2082E for ; Fri, 12 Apr 2019 12:37:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DV/Owl/x"; 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="o8ep84Q2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3F2C2082E 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=xV5AoozkkEHZRPcnDMO2HjEe+QZuU+MzRbHxyktJDGk=; b=DV/Owl/xWUih+K oYiM8rKKuxN4z59o8wh8ER5I+mnTGun54TgFHcuv/Ub1S/T2BUp6qJARX7ukO7SjbEuaNRzebJJhE +ljtjYqSYSrm6TEh35UU6JBCGlAOV+wj35b0+TGt0I/mOIFdHVSjQtAwrzmDd8391jxuUiXQek18M zVrms1MxZalktxKQEF6AO+cqZ5NiLK4NZaluNrOrvjh4cpNiE8PpUWmMVnNhdGu9rJsL1IZxQ/tmG 7wvvPkLagHpDQcmyleIN5YwHo99RexZtCJ6TLQYvA3wKQBKB4DBkaxJZ6j7aWDpKPxyQIZe3YgN5C LaJKZEocabkKrr3y14IQ==; 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 1hEvQw-0005FO-Ro; Fri, 12 Apr 2019 12:37:30 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEvQH-0004PG-Ed for linux-arm-kernel@lists.infradead.org; Fri, 12 Apr 2019 12:36:54 +0000 Received: by mail-wm1-x344.google.com with SMTP id h18so10835293wml.1 for ; Fri, 12 Apr 2019 05:36:49 -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=WkiOzqo+5E8+PTnExhJYSKG8TC17kxUDe5ZrFElD/ZE=; b=o8ep84Q2/ISktCjQUU+vyYVsFjv1uyAK6SwCYaD4jFPEo1k0bqeNPAX2jydpt0quHY bdNKR/nqe+T1MnRzAEgttYd8HKmhNU6RmqlSVrBFkF3Tuw0l03zBIUjHbg43TaV5Bclb LSZgulopBXIDgJMrb5b5UIBko9QP9OAbuYNHmFH8NO3bBAbI/mTQAO6m5neAmfWsoa4Q fMBh0U+4dVQn9lxZ5mzervhRl1oNb0j+HvJWs60pSM11dqXvjmxNPElY5dcp0ZlWTiRd sYmPyrrlZu/xWk2pKs7wnczZPF6P5kLTlH4bDO9xGuiZaEhXj733gUATOFKZD2W3qU+A /rtQ== 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=WkiOzqo+5E8+PTnExhJYSKG8TC17kxUDe5ZrFElD/ZE=; b=gbgZl3lWDEQlm7DjVcYTVkBx90hwK5WSBJtOEA8pROWnb53Uj/Wd2CbpsEjiWkux7F p9igFCtezzN77N6UbJ7Rhbqh4GVguBhdLouzPvgjzznxey9p+Msvt3EBtvzqU9PDtirG 0CYSiYCfU8vFBF+UTRmXlkD2kWL2K0yQaVjKugzs60IQYeLoP920bIkWaevT51s4YARG m2YDVQvB/Yild0f9hZyrSzqHYnBPVSW4yBcQLHzY1chJppOB+TGtv477iras9tPHFkhq YKen6plSNQYSiDDE8eIcHPtH9BRp34sKTHhMgoDFWSSZKaa8ZsqyKp2p+90QwB5x8e6O UeZg== X-Gm-Message-State: APjAAAWcFXk3GtpHnY86pL7YrTKUyk2jXkt2ePdIb4Ot9/A5Tlyoxr6X jSobV0trvGqJzeZmX268AISaYg== X-Google-Smtp-Source: APXvYqzzQFHewKkSvNQ7QQk9hjqwJsoMiX45q4ONdF3ZP0biYEW/amEcQzL4GiM88Y5pcvpDlAVuKQ== X-Received: by 2002:a1c:730c:: with SMTP id d12mr11021693wmb.47.1555072608151; Fri, 12 Apr 2019 05:36:48 -0700 (PDT) Received: from localhost.localdomain (aputeaux-684-1-35-248.w90-86.abo.wanadoo.fr. [90.86.90.248]) by smtp.gmail.com with ESMTPSA id v190sm12384030wme.18.2019.04.12.05.36.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 05:36:47 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Alan Stern , Greg Kroah-Hartman Subject: [PATCH v5 4/6] ARM: davinci: omapl138-hawk: add a fixed regulator for ohci-da8xx Date: Fri, 12 Apr 2019 14:36:38 +0200 Message-Id: <20190412123640.11437-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190412123640.11437-1-brgl@bgdev.pl> References: <20190412123640.11437-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190412_053649_807145_7195E214 X-CRM114-Status: GOOD ( 14.43 ) 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 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-omapl138-hawk.c | 49 +++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index e244c8648594..db177a6a7e48 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -298,15 +299,50 @@ static const short da850_hawk_usb11_pins[] = { -1 }; -static struct gpiod_lookup_table hawk_usb_gpio_lookup = { +static struct regulator_consumer_supply hawk_usb_supplies[] = { + REGULATOR_SUPPLY("vbus", NULL), +}; + +static struct regulator_init_data hawk_usb_vbus_data = { + .consumer_supplies = hawk_usb_supplies, + .num_consumer_supplies = ARRAY_SIZE(hawk_usb_supplies), +}; + +static struct fixed_voltage_config hawk_usb_vbus = { + .supply_name = "vbus", + .microvolts = 3300000, + .init_data = &hawk_usb_vbus_data, +}; + +static struct platform_device hawk_usb_vbus_device = { + .name = "reg-fixed-voltage", + .id = 0, + .dev = { + .platform_data = &hawk_usb_vbus, + }, +}; + +static struct gpiod_lookup_table hawk_usb_oc_gpio_lookup = { .dev_id = "ohci-da8xx", .table = { - GPIO_LOOKUP("davinci_gpio", DA850_USB1_VBUS_PIN, "vbus", 0), GPIO_LOOKUP("davinci_gpio", DA850_USB1_OC_PIN, "oc", 0), { } }, }; +static struct gpiod_lookup_table hawk_usb_vbus_gpio_lookup = { + .dev_id = "reg-fixed-voltage.0", + .table = { + GPIO_LOOKUP("davinci_gpio", DA850_USB1_VBUS_PIN, NULL, 0), + { } + }, +}; + +static struct gpiod_lookup_table *hawk_usb_gpio_lookups[] = { + &hawk_usb_oc_gpio_lookup, + &hawk_usb_vbus_gpio_lookup, +}; + static struct da8xx_ohci_root_hub omapl138_hawk_usb11_pdata = { /* TPS2087 switch @ 5V */ .potpgt = (3 + 1) / 2, /* 3 ms max */ @@ -327,12 +363,19 @@ static __init void omapl138_hawk_usb_init(void) pr_warn("%s: USB PHY CLK registration failed: %d\n", __func__, ret); + gpiod_add_lookup_tables(hawk_usb_gpio_lookups, + ARRAY_SIZE(hawk_usb_gpio_lookups)); + ret = da8xx_register_usb_phy(); if (ret) pr_warn("%s: USB PHY registration failed: %d\n", __func__, ret); - gpiod_add_lookup_table(&hawk_usb_gpio_lookup); + ret = platform_device_register(&hawk_usb_vbus_device); + if (ret) { + pr_warn("%s: Unable to register the vbus supply\n", __func__); + return; + } ret = da8xx_register_usb11(&omapl138_hawk_usb11_pdata); if (ret) -- 2.21.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel