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: [v2,5/6] ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx From: Bartosz Golaszewski Message-Id: <20190329093334.3885-6-brgl@bgdev.pl> Date: Fri, 29 Mar 2019 10:33:33 +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 YTgzMC1ldm0uYyB8IDQ5ICsrKysrKysrKysrKysrKysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2Vk LCA0NiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gvYXJt L21hY2gtZGF2aW5jaS9ib2FyZC1kYTgzMC1ldm0uYyBiL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9i b2FyZC1kYTgzMC1ldm0uYwppbmRleCBlM2Q3NGU0M2M0N2QuLjZjYWY1MGJiOTJjOSAxMDA2NDQK LS0tIGEvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2JvYXJkLWRhODMwLWV2bS5jCisrKyBiL2FyY2gv YXJtL21hY2gtZGF2aW5jaS9ib2FyZC1kYTgzMC1ldm0uYwpAQCAtMjksNiArMjksNyBAQAogI2lu Y2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RhdGEvc3BpLWRhdmluY2kuaD4KICNpbmNsdWRlIDxsaW51 eC9wbGF0Zm9ybV9kYXRhL3VzYi1kYXZpbmNpLmg+CiAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1f ZGF0YS90aS1hZW1pZi5oPgorI2luY2x1ZGUgPGxpbnV4L3JlZ3VsYXRvci9maXhlZC5oPgogI2lu Y2x1ZGUgPGxpbnV4L3JlZ3VsYXRvci9tYWNoaW5lLmg+CiAjaW5jbHVkZSA8bGludXgvbnZtZW0t cHJvdmlkZXIuaD4KIApAQCAtNTMsMTUgKzU0LDUwIEBAIHN0YXRpYyBjb25zdCBzaG9ydCBkYTgz MF9ldm1fdXNiMTFfcGluc1tdID0gewogCS0xCiB9OwogCi1zdGF0aWMgc3RydWN0IGdwaW9kX2xv b2t1cF90YWJsZSBkYTgzMF9ldm1fdXNiX2dwaW9fbG9va3VwID0geworc3RhdGljIHN0cnVjdCBy ZWd1bGF0b3JfY29uc3VtZXJfc3VwcGx5IGRhODMwX2V2bV91c2Jfc3VwcGxpZXNbXSA9IHsKKwlS RUdVTEFUT1JfU1VQUExZKCJ2YnVzIiwgTlVMTCksCit9OworCitzdGF0aWMgc3RydWN0IHJlZ3Vs YXRvcl9pbml0X2RhdGEgZGE4MzBfZXZtX3VzYl92YnVzX2RhdGEgPSB7CisJLmNvbnN1bWVyX3N1 cHBsaWVzCT0gZGE4MzBfZXZtX3VzYl9zdXBwbGllcywKKwkubnVtX2NvbnN1bWVyX3N1cHBsaWVz CT0gQVJSQVlfU0laRShkYTgzMF9ldm1fdXNiX3N1cHBsaWVzKSwKK307CisKK3N0YXRpYyBzdHJ1 Y3QgZml4ZWRfdm9sdGFnZV9jb25maWcgZGE4MzBfZXZtX3VzYl92YnVzID0geworCS5zdXBwbHlf bmFtZQkJPSAidmJ1cyIsCisJLm1pY3Jvdm9sdHMJCT0gMzMwMDAwMDAsCisJLmluaXRfZGF0YQkJ PSAmZGE4MzBfZXZtX3VzYl92YnVzX2RhdGEsCit9OworCitzdGF0aWMgc3RydWN0IHBsYXRmb3Jt X2RldmljZSBkYTgzMF9ldm1fdXNiX3ZidXNfZGV2aWNlID0geworCS5uYW1lCQk9ICJyZWctZml4 ZWQtdm9sdGFnZSIsCisJLmlkCQk9IDEsCisJLmRldgkJPSB7CisJCS5wbGF0Zm9ybV9kYXRhID0g JmRhODMwX2V2bV91c2JfdmJ1cywKKwl9LAorfTsKKworc3RhdGljIHN0cnVjdCBncGlvZF9sb29r dXBfdGFibGUgZGE4MzBfZXZtX3VzYl9vY19ncGlvX2xvb2t1cCA9IHsKIAkuZGV2X2lkCQk9ICJv aGNpLWRhOHh4IiwKIAkudGFibGUgPSB7Ci0JCUdQSU9fTE9PS1VQKCJkYXZpbmNpX2dwaW8iLCBP Tl9CRF9VU0JfRFJWLCAidmJ1cyIsIDApLAogCQlHUElPX0xPT0tVUCgiZGF2aW5jaV9ncGlvIiwg T05fQkRfVVNCX09WQywgIm9jIiwgMCksCiAJCXsgfQogCX0sCiB9OwogCitzdGF0aWMgc3RydWN0 IGdwaW9kX2xvb2t1cF90YWJsZSBkYTgzMF9ldm1fdXNiX3ZidXNfZ3Bpb19sb29rdXAgPSB7CisJ LmRldl9pZAkJPSAicmVnLWZpeGVkLXZvbHRhZ2UuMSIsCisJLnRhYmxlID0geworCQlHUElPX0xP 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=-6.2 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,UNWANTED_LANGUAGE_BODY,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 29A83C4360F for ; Fri, 29 Mar 2019 09:34:51 +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 ED6F620643 for ; Fri, 29 Mar 2019 09:34:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="t/X0XPPU"; 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="iXnzMUAb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED6F620643 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=m13yXAC/CiN8+zxuAVDMqV7vpJ23u45HBd1E1/5yUoU=; b=t/X0XPPUaoRxFT JhkQj6o3oV6tB3xNcHY36gxXQrR9DAnodUB8qJzKsR0rLxQ7lJ8tKXzl93tH68JHCzhWqJXxOkVwc 71HxVWGEsl/l3omv61bkmu5RWAIYz1nNWaqoFueQ1S7e4fH4KF2sDLWjhbRTq84XkScUG4/2+Twe/ YC5na/+b2EIheKakcgwxWZ3rmKFZAABFhtUrwRjo9tgGp6AeRB5wBj2ZiErSubs6mel/fZh5Kr9Fn fq6jcXK38CGrzGv+sJiYqis8A+C6/q1NXUYN7+u87nwGZE/XOlSMTZUm2W7m86wlGfyAcObzONRvB 5yBcxBPwITrdYT+yZGAA==; 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 1h9nuN-0002fq-Jf; Fri, 29 Mar 2019 09:34:43 +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 1h9ntV-0001WB-Gj for linux-arm-kernel@lists.infradead.org; Fri, 29 Mar 2019 09:33:53 +0000 Received: by mail-wr1-x442.google.com with SMTP id w1so1732522wrp.2 for ; Fri, 29 Mar 2019 02:33: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=LbCGKRK2X1xPLdacL1xB8HrW5AVjZ0KwD0ifnHHdo+g=; b=iXnzMUAbcdao3LV0SCIWLlFt13jR8QGk+hMydpXfSkXJxiCsmrH8Mwys7RmZd8DPPg U8UdLbiJbouQI+10MCIO0al7cvmezfM+euBlKqPg5Iz+EemT8qvo0OuXJPsa6LyEUHrY JEN0GyEVwstJJxTWyuwys8W9ZCY6ai8JgeyJOWYlfgAV0HJFXpNMG8hHe4VOTMnqg+Oc Pa3dpsYguhAPCzmQaURjD/JrCZRxwrpf6BeyLpI7NVyP+c6xj5j9AMZm0hf32eI73w/d dqZxKPeFbYA6Bg9OxrLuyHmj9bfGFUbfjSF8OCc3zmX0YRWcKS3eZNm/yH/ae6g3Df+y oLYQ== 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=LbCGKRK2X1xPLdacL1xB8HrW5AVjZ0KwD0ifnHHdo+g=; b=ZzElBWUMmizB5FHG6E5RHlnAt1z+bFi75bIdhU4ep0muzK6Py7myts3vASk8kX8VC8 DAMHJTgAJ7I1yD4IEOAxiKuccEakmYd0IcZEzrHNZJ651iNl/RunqCxp0wkxn14fR+ns F+9qbxurLzK5gB6MrFN0Ijk/qNMDQcgAiMSTeJSuu+Ej9fNhbuSVWzPuDuU9XlXsGM7W 0qhYmjux60S/381wxD+FOyhYqXSQd4Y/x1yFe65JKHnkXKnzujklnUQ9MfzKOP7Gmj6A rMhZicmxvL9Yyf3dSZo04ZyDsJ89Jl75Jk12JkeHnU7HysuXEMDkJDi45vzMFVDAnQtd UhDg== X-Gm-Message-State: APjAAAXWfbcVyLzxcifwlJRm4Jt0dTjOt3HQ/OARpY3rDAPmogx0JWSC DI0vdr+O9IO5qkWAC8wvZR8wBg== X-Google-Smtp-Source: APXvYqyQR9UvO6TWHtcUrh4IiHTJ7pi8WetsR42Ox4VYCAjcb/5UecHqkFGawyhYmd0frxyujftF8A== X-Received: by 2002:adf:cc85:: with SMTP id p5mr9510456wrj.101.1553852028108; Fri, 29 Mar 2019 02:33:48 -0700 (PDT) Received: from localhost.localdomain (aputeaux-684-1-29-77.w90-86.abo.wanadoo.fr. [90.86.254.77]) by smtp.gmail.com with ESMTPSA id s12sm1957125wmj.42.2019.03.29.02.33.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 02:33:47 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Alan Stern , Greg Kroah-Hartman Subject: [PATCH v2 5/6] ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx Date: Fri, 29 Mar 2019 10:33:33 +0100 Message-Id: <20190329093334.3885-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190329093334.3885-1-brgl@bgdev.pl> References: <20190329093334.3885-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190329_023349_804465_FA6AA8E7 X-CRM114-Status: GOOD ( 14.32 ) 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 | 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..6caf50bb92c9 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 = 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 */ @@ -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 _______________________________________________ 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=DKIMWL_WL_MED,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 2E75FC10F05 for ; Fri, 29 Mar 2019 09:34:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E746020643 for ; Fri, 29 Mar 2019 09:34:00 +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="iXnzMUAb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728874AbfC2Jd7 (ORCPT ); Fri, 29 Mar 2019 05:33:59 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43550 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728818AbfC2Jdu (ORCPT ); Fri, 29 Mar 2019 05:33:50 -0400 Received: by mail-wr1-f66.google.com with SMTP id k17so1685036wrx.10 for ; Fri, 29 Mar 2019 02:33: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=LbCGKRK2X1xPLdacL1xB8HrW5AVjZ0KwD0ifnHHdo+g=; b=iXnzMUAbcdao3LV0SCIWLlFt13jR8QGk+hMydpXfSkXJxiCsmrH8Mwys7RmZd8DPPg U8UdLbiJbouQI+10MCIO0al7cvmezfM+euBlKqPg5Iz+EemT8qvo0OuXJPsa6LyEUHrY JEN0GyEVwstJJxTWyuwys8W9ZCY6ai8JgeyJOWYlfgAV0HJFXpNMG8hHe4VOTMnqg+Oc Pa3dpsYguhAPCzmQaURjD/JrCZRxwrpf6BeyLpI7NVyP+c6xj5j9AMZm0hf32eI73w/d dqZxKPeFbYA6Bg9OxrLuyHmj9bfGFUbfjSF8OCc3zmX0YRWcKS3eZNm/yH/ae6g3Df+y oLYQ== 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=LbCGKRK2X1xPLdacL1xB8HrW5AVjZ0KwD0ifnHHdo+g=; b=Who755nSg5WpMpuu7ER2mjAAbtdQztARVG3EGcgDYuS4FIU6oXim+bEYUkavlWLx0j WBB6MY04tsKGDGo+/eT9YqeEJDM+7bqJo9VBqK1mVGHNBEU7gHWBInoBdBG+lX8g+PUX 4tquW/BUYPDmehMUvViWkVobT3LI06BKIrq8+lkBRiqysV/HhQuRYLgpcrroIc+Y6gcS 4Q6o3SJ8ByexBbGwGURn2IIYy/0C9VHImI8fhqXTmPoBhqmwullyH9pnByCRXAJ/lCof wLZ4o6oPMrJZWG08r7/7Run+QEOk7icsVbIyyze3DjpT1ifzYDmM2sXGlu+uQ/1ikbgR K/aw== X-Gm-Message-State: APjAAAUKeWuuBOXXp8vFRw0Zy3q8YB6aDOZVE8vNJNxLypNQvXb4TVt7 BIyDlFB6iijdp4+Qkzt3Jsl5rw== X-Google-Smtp-Source: APXvYqyQR9UvO6TWHtcUrh4IiHTJ7pi8WetsR42Ox4VYCAjcb/5UecHqkFGawyhYmd0frxyujftF8A== X-Received: by 2002:adf:cc85:: with SMTP id p5mr9510456wrj.101.1553852028108; Fri, 29 Mar 2019 02:33:48 -0700 (PDT) Received: from localhost.localdomain (aputeaux-684-1-29-77.w90-86.abo.wanadoo.fr. [90.86.254.77]) by smtp.gmail.com with ESMTPSA id s12sm1957125wmj.42.2019.03.29.02.33.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 02:33: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 v2 5/6] ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx Date: Fri, 29 Mar 2019 10:33:33 +0100 Message-Id: <20190329093334.3885-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190329093334.3885-1-brgl@bgdev.pl> References: <20190329093334.3885-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 | 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..6caf50bb92c9 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 = 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 */ @@ -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