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: [2/3] ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx From: Bartosz Golaszewski Message-Id: <20190326155728.5432-3-brgl@bgdev.pl> Date: Tue, 26 Mar 2019 16:57:27 +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: RnJvbTogQmFydG9zeiBHb2xhc3pld3NraSA8YmdvbGFzemV3c2tpQGJheWxpYnJlLmNvbT4KCklu c3RlYWQgb2YgZGlyZWN0bHkgdXNpbmcgdGhlIHZidXMgR1BJTyB3ZSBzaG91bGQgbW9kZWwgaXQg YXMgYSBmaXhlZApyZWd1bGF0b3IuIEFkZCBhbGwgbmVjZXNzYXJ5IGZpeC11cHMgZm9yIHRoZSBy ZWd1bGF0b3IgdG8gYmUgcmVnaXN0ZXJlZAphbmQgY29uZmlndXJlIHRoZSB2YnVzIEdQSU8gYXMg aXRzIGVuYWJsZSBwaW4uCgpTaWduZWQtb2ZmLWJ5OiBCYXJ0b3N6IEdvbGFzemV3c2tpIDxiZ29s YXN6ZXdza2lAYmF5bGlicmUuY29tPgotLS0KIGFyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1k YTgzMC1ldm0uYyB8IDQ4ICsrKysrKysrKysrKysrKysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2Vk LCA0NSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gvYXJt L21hY2gtZGF2aW5jaS9ib2FyZC1kYTgzMC1ldm0uYyBiL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9i b2FyZC1kYTgzMC1ldm0uYwppbmRleCBmZjA5N2VjZmE0NTEuLjJhZTFlZmY1NDM0NSAxMDA2NDQK LS0tIGEvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2JvYXJkLWRhODMwLWV2bS5jCisrKyBiL2FyY2gv YXJtL21hY2gtZGF2aW5jaS9ib2FyZC1kYTgzMC1ldm0uYwpAQCAtMjksNiArMjksNyBAQAogI2lu Y2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RhdGEvc3BpLWRhdmluY2kuaD4KICNpbmNsdWRlIDxsaW51 eC9wbGF0Zm9ybV9kYXRhL3VzYi1kYXZpbmNpLmg+CiAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1f ZGF0YS90aS1hZW1pZi5oPgorI2luY2x1ZGUgPGxpbnV4L3JlZ3VsYXRvci9maXhlZC5oPgogI2lu Y2x1ZGUgPGxpbnV4L3JlZ3VsYXRvci9tYWNoaW5lLmg+CiAjaW5jbHVkZSA8bGludXgvbnZtZW0t cHJvdmlkZXIuaD4KIApAQCAtNTMsMTQgKzU0LDQ4IEBAIHN0YXRpYyBjb25zdCBzaG9ydCBkYTgz MF9ldm1fdXNiMTFfcGluc1tdID0gewogCS0xCiB9OwogCi1zdGF0aWMgc3RydWN0IGdwaW9kX2xv b2t1cF90YWJsZSBkYTgzMF9ldm1fdXNiX2dwaW9fbG9va3VwID0geworc3RhdGljIHN0cnVjdCBy ZWd1bGF0b3JfY29uc3VtZXJfc3VwcGx5IGRhODMwX2V2bV91c2Jfc3VwcGxpZXNbXSA9IHsKKwlS RUdVTEFUT1JfU1VQUExZKCJ2YnVzIiwgTlVMTCksCit9OworCitzdGF0aWMgc3RydWN0IHJlZ3Vs YXRvcl9pbml0X2RhdGEgZGE4MzBfZXZtX3VzYl92YnVzX2RhdGEgPSB7CisJLmNvbnN1bWVyX3N1 cHBsaWVzCT0gZGE4MzBfZXZtX3VzYl9zdXBwbGllcywKKwkubnVtX2NvbnN1bWVyX3N1cHBsaWVz CT0gQVJSQVlfU0laRShkYTgzMF9ldm1fdXNiX3N1cHBsaWVzKSwKK307CisKK3N0YXRpYyBzdHJ1 Y3QgZml4ZWRfdm9sdGFnZV9jb25maWcgZGE4MzBfZXZtX3VzYl92YnVzID0geworCS5zdXBwbHlf bmFtZQkJPSAidmJ1cyIsCisJLm1pY3Jvdm9sdHMJCT0gMzMwMDAwMDAsCisJLmluaXRfZGF0YQkJ PSAmZGE4MzBfZXZtX3VzYl92YnVzX2RhdGEsCit9OworCitzdGF0aWMgc3RydWN0IHBsYXRmb3Jt X2RldmljZSBkYTgzMF9ldm1fdXNiX3ZidXNfZGV2aWNlID0geworCS5uYW1lCQk9ICJyZWctZml4 ZWQtdm9sdGFnZSIsCisJLmlkCQk9IDEsCisJLmRldgkJPSB7CisJCS5wbGF0Zm9ybV9kYXRhID0g JmRhODMwX2V2bV91c2JfdmJ1cywKKwl9LAorfTsKKworc3RhdGljIHN0cnVjdCBncGlvZF9sb29r dXBfdGFibGUgZGE4MzBfZXZtX3VzYl9vY19ncGlvX2xvb2t1cCA9IHsKIAkuZGV2X2lkCQk9ICJv aGNpLWRhOHh4IiwKIAkudGFibGUgPSB7Ci0JCUdQSU9fTE9PS1VQKCJkYXZpbmNpX2dwaW8iLCBP Tl9CRF9VU0JfRFJWLCAidmJ1cyIsIDApLAogCQlHUElPX0xPT0tVUCgiZGF2aW5jaV9ncGlvIiwg T05fQkRfVVNCX09WQywgIm9jIiwgMCksCiAJfSwKIH07CiAKK3N0YXRpYyBzdHJ1Y3QgZ3Bpb2Rf bG9va3VwX3RhYmxlIGRhODMwX2V2bV91c2JfdmJ1c19ncGlvX2xvb2t1cCA9IHsKKwkuZGV2X2lk CQk9ICJyZWctZml4ZWQtdm9sdGFnZS4xIiwKKwkudGFibGUgPSB7CisJCUdQSU9fTE9PS1VQKCJk YXZpbmNpX2dwaW8iLCBPTl9CRF9VU0JfRFJWLCAidmJ1cyIsIDApLAorCX0sCit9OworCitzdGF0 aWMgc3RydWN0IGdwaW9kX2xvb2t1cF90YWJsZSAqZGE4MzBfZXZtX3VzYl9ncGlvX2xvb2t1cHNb XSA9IHsKKwkmZGE4MzBfZXZtX3VzYl9vY19ncGlvX2xvb2t1cCwKKwkmZGE4MzBfZXZtX3VzYl92 YnVzX2dwaW9fbG9va3VwLAorfTsKKwogc3RhdGljIHN0cnVjdCBkYTh4eF9vaGNpX3Jvb3RfaHVi IGRhODMwX2V2bV91c2IxMV9wZGF0YSA9IHsKIAkvKiBUUFMyMDY1IHN3aXRjaCBAIDVWICovCiAJ LnBvdHBndAkJPSAoMyArIDEpIC8gMiwJLyogMyBtcyBtYXggKi8KQEAgLTc1LDYgKzExMCw5IEBA IHN0YXRpYyBfX2luaXQgdm9pZCBkYTgzMF9ldm1fdXNiX2luaXQodm9pZCkKIAkJcHJfd2Fybigi JXM6IFVTQiBQSFkgQ0xLIHJlZ2lzdHJhdGlvbiBmYWlsZWQ6ICVkXG4iLAogCQkJX19mdW5jX18s IHJldCk7CiAKKwlncGlvZF9hZGRfbG9va3VwX3RhYmxlcyhkYTgzMF9ldm1fdXNiX2dwaW9fbG9v a3VwcywKKwkJCQlBUlJBWV9TSVpFKGRhODMwX2V2bV91c2JfZ3Bpb19sb29rdXBzKSk7CisKIAly ZXQgPSBkYTh4eF9yZWdpc3Rlcl91c2JfcGh5KCk7CiAJaWYgKHJldCkKIAkJcHJfd2FybigiJXM6 IFVTQiBQSFkgcmVnaXN0cmF0aW9uIGZhaWxlZDogJWRcbiIsCkBAIC0xMDAsNyArMTM4LDExIEBA IHN0YXRpYyBfX2luaXQgdm9pZCBkYTgzMF9ldm1fdXNiX2luaXQodm9pZCkKIAkJcmV0dXJuOwog CX0KIAotCWdwaW9kX2FkZF9sb29rdXBfdGFibGUoJmRhODMwX2V2bV91c2JfZ3Bpb19sb29rdXAp OworCXJldCA9IHBsYXRmb3JtX2RldmljZV9yZWdpc3RlcigmZGE4MzBfZXZtX3VzYl92YnVzX2Rl dmljZSk7CisJaWYgKHJldCkgeworCQlwcl93YXJuKCIlczogVW5hYmxlIHRvIHJlZ2lzdGVyIHRo ZSB2YnVzIHN1cHBseVxuIiwgX19mdW5jX18pOworCQlyZXR1cm47CisJfQogCiAJcmV0ID0gZGE4 eHhfcmVnaXN0ZXJfdXNiMTEoJmRhODMwX2V2bV91c2IxMV9wZGF0YSk7CiAJaWYgKHJldCkK 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=-6.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,UNWANTED_LANGUAGE_BODY,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 03E56C43381 for ; Tue, 26 Mar 2019 16:07:08 +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 BB90720811 for ; Tue, 26 Mar 2019 16:07:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="opTk7MMC"; 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="OrEKiMg+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB90720811 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=tjrtyIOZnArUM6dVL2O4oE/+LClDH253DIRW/E/iYAA=; b=opTk7MMChOJaNP EPO+i4IschmUQvB6we5729vZLznXJ/FpHqvbIpfKXDg4jYuAma9YGelmo/UcB3a22Nbvrk1/802te j3NYpT599tf5kCEDaNTqgAL9ozrrSbBqy9GzCczM2Fq1s1c5BzIH9Sn+rHzW7GP26yYqZ9XkBlKnl QgOBzQrh2dSEA3XZs6cT6TGpOA05pYz6YWOl5bgfeWLSqKxcMUVFwTcUDFnSE0uixXHFzAYuMQtJl 9GlXvednCBKusJIrydXwTWnyhcdCvBO27km1z7gshRKYYVltwpD1fdk0c6qWHIhxDKVoTY+UiDKd3 8ZRfZalddjjSYRXkbFIA==; 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 1h8obS-0004FN-Ki; Tue, 26 Mar 2019 16:07:06 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8oSL-0000LJ-Id for linux-arm-kernel@lists.infradead.org; Tue, 26 Mar 2019 15:57:48 +0000 Received: by mail-wr1-x442.google.com with SMTP id w1so15037612wrp.2 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=Fi53ij1K/FV0HXXK08Smgt19lpbi7fcy/SCdbK/jhdY=; b=OrEKiMg+9Ou8/jDznyyH/U1jZPDJT7dDsPHu5jqDLpg25175m5U4qLuDHHjGIwv6Gu tfbKNt2UuI55ydlK47FM2dKOovk1vgzZoth2pEaGyL6ewUTUPMVI6aYQt+sASC5iXSbE aE0Qt1UbdH9WVtBtURoecs9HJBrmdBy5aIc/xnYlDxwxnsIr1CUvJ91IZXuY5rlyC3zK CCCEmiG31EHlcT+qkjuesday19DM6nb1vxMhbnlnRZegKgRohm9EOWQ4z/NPtWt5+i6x 83tX7Fz1jaWIuzDiCNzEtclKqX6s04O4ZCUwHz9PTeihgISS5AQMcvE7wsd/d2zlLQg9 2Hfw== 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=Fi53ij1K/FV0HXXK08Smgt19lpbi7fcy/SCdbK/jhdY=; b=q/JFfYq0T8Wp/Jg4CoFKpuVHYTZ6LZgmV9A5lV49fUCqMbIVRv2CPKST1LivFHxJcq TKt+xpr4J+N/FxcwqbL/qR7XAWpDJob/Ln7KDsaxTnt0GLMx6aHGLuuCLJMPF3K+6Gr9 AJgGf++6IhciFYW+heFNwOQFTiOsgzRw67uxlFDwshqdJ3v/TYCwWnaFXX56ljDYR0Cb Hxl3IPpwI/MCqAWlBZpLV262U7e3FN5Fi5iyxDBO3xkXAk/k0blpg+T8LuAc9M9fFOKC pJyAp2UPjhuGCj3CTbJZQZ474mbbm6WYx8mLk8eiWFPL8Y5waWN1XJMqnvsQzyRKRbx8 i1Qg== X-Gm-Message-State: APjAAAWw9JvZOyyS2krML10gsasl9O+hhxnuc4HEoOEArGDeu9GKDPGD kuCdw5WUngS+4T1YrQlZ/eEJOg== X-Google-Smtp-Source: APXvYqzhrAPxJruRDv7MCyTAjE/yvjaZbO0Ofuanv/eh0AwxC1c/i4MCwEQM7vjvH08MsIdaVWFLgw== X-Received: by 2002:adf:eb84:: with SMTP id t4mr21459803wrn.100.1553615858033; Tue, 26 Mar 2019 08:57:38 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 08:57:37 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Alan Stern , Greg Kroah-Hartman Subject: [PATCH 2/3] ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx Date: Tue, 26 Mar 2019 16:57:27 +0100 Message-Id: <20190326155728.5432-3-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_085741_746790_E01E78CF X-CRM114-Status: GOOD ( 13.77 ) 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-da830-evm.c | 48 +++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index ff097ecfa451..2ae1eff54345 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,14 +54,48 @@ 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 = 1, + .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.1", + .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 */ @@ -75,6 +110,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", @@ -100,7 +138,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.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,URIBL_BLOCKED,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 141E0C43381 for ; Tue, 26 Mar 2019 15:57:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBA6B20863 for ; Tue, 26 Mar 2019 15:57:51 +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="OrEKiMg+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732068AbfCZP5u (ORCPT ); Tue, 26 Mar 2019 11:57:50 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:42091 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731475AbfCZP5k (ORCPT ); Tue, 26 Mar 2019 11:57:40 -0400 Received: by mail-wr1-f65.google.com with SMTP id g3so11498604wrx.9 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=Fi53ij1K/FV0HXXK08Smgt19lpbi7fcy/SCdbK/jhdY=; b=OrEKiMg+9Ou8/jDznyyH/U1jZPDJT7dDsPHu5jqDLpg25175m5U4qLuDHHjGIwv6Gu tfbKNt2UuI55ydlK47FM2dKOovk1vgzZoth2pEaGyL6ewUTUPMVI6aYQt+sASC5iXSbE aE0Qt1UbdH9WVtBtURoecs9HJBrmdBy5aIc/xnYlDxwxnsIr1CUvJ91IZXuY5rlyC3zK CCCEmiG31EHlcT+qkjuesday19DM6nb1vxMhbnlnRZegKgRohm9EOWQ4z/NPtWt5+i6x 83tX7Fz1jaWIuzDiCNzEtclKqX6s04O4ZCUwHz9PTeihgISS5AQMcvE7wsd/d2zlLQg9 2Hfw== 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=Fi53ij1K/FV0HXXK08Smgt19lpbi7fcy/SCdbK/jhdY=; b=P+iOL7HpX32TMqr3g6rwC/OhOcFp3sdEtqNP5hqPzJ57h3GzTiLaMSRKxXSKdt1K8g 1ho6Ze8+m5Z52W3bKGXca5POhqCrOhCrWLkrKRgymRy7Wz5T7+DD3cf3anj8nDkp6h2O csRB7yF+cNjWdHx/VlVO9Y26DMSzFUwQ8th45DbLMjwgXKGhNc7jxNdhWl/SYPdQmfkK Wv88Dut+fgunJvOv6S9u7GnMhrWa15JATrie1Yk/i8doryj2WgVCplhGEkyaeAsJ8RFg MlPcdCFkRAqsMFvtvw2pEE1ktKkKZISED8ctyJjjMAe0Avn3hJSAH1vMsNLXKbWV6XhD 8ucA== X-Gm-Message-State: APjAAAXePqte6jxmaPddFojR+Bc1T9k1tBVaA6e31RQ/1JON0Q3V4l2G 9y5oQtpZpF+1QyhAVvj4TyxKGw== X-Google-Smtp-Source: APXvYqzhrAPxJruRDv7MCyTAjE/yvjaZbO0Ofuanv/eh0AwxC1c/i4MCwEQM7vjvH08MsIdaVWFLgw== X-Received: by 2002:adf:eb84:: with SMTP id t4mr21459803wrn.100.1553615858033; Tue, 26 Mar 2019 08:57:38 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 08:57:37 -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 2/3] ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx Date: Tue, 26 Mar 2019 16:57:27 +0100 Message-Id: <20190326155728.5432-3-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 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 | 48 +++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index ff097ecfa451..2ae1eff54345 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,14 +54,48 @@ 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 = 1, + .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.1", + .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 */ @@ -75,6 +110,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", @@ -100,7 +138,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.20.1