From patchwork Tue Mar 26 15:57:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10871473 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 953C413B5 for ; Tue, 26 Mar 2019 15:57:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80748285CD for ; Tue, 26 Mar 2019 15:57:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 741CF28AE1; Tue, 26 Mar 2019 15:57:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E036285CD for ; Tue, 26 Mar 2019 15:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731613AbfCZP5j (ORCPT ); Tue, 26 Mar 2019 11:57:39 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46773 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726177AbfCZP5i (ORCPT ); Tue, 26 Mar 2019 11:57:38 -0400 Received: by mail-wr1-f68.google.com with SMTP id o1so14958438wrs.13 for ; Tue, 26 Mar 2019 08:57: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=6RoQu7lKq5HUjsOpqb5VBB45JH3hBOA4zTqWoTxIGD0=; b=2AHMFk/nV5es0CsmlQNEAIl+UXjXuD9BY51qYWm4ehk9X8dG1QUsoNCAXpMvlhH7Yf IN5YEtJVEBJfAUOj69n6pKbfvWQKkf+zgH78/S+OXP7aL5vS+rVnXVaEAlpe22TZMwjh oIA+xxnD09PC1d7gp7X/fJzWrb1AMAtBHgtzTtdYOO0gXAX8FQv/kXiXxgHh/1LqRKSa pKd+xwZqf6SVmOt/B42PXgO/2/fVML/+pCAdpTdozi90nJxPzhlXTXaTDpI0Gauj0AEd HX6AvkpZFtqrfhzFw0K3UJPbZcZjitIKe2xPxJ6ItfyseU7XMHkqe6jjG4q/b8lBn81K KUbA== 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=6RoQu7lKq5HUjsOpqb5VBB45JH3hBOA4zTqWoTxIGD0=; b=t36/iXG9ou2/powcDkXBpC/XH5wJMc4/R3rKp4FmxibMgsER0J36GkHlPJVyB1lJ5z /ZxJsvmmLZqhjX8jzR5ZurikjSMC4av/wIXdAeM5KfrCfV+rHBaDOGoZ9OKtPSh+3lyE /0NZJOH2h8wh+rQaKwoV4w8x2njHZpTK6oNj0CPx18W/gSMq7ra9IeLaVQSWbMyzpCel 1u2wrdgdRIibQTjK6g6Zk0tKXva6E5LQOij7llJGzmQVCxBfDNh324nmxNax2/06phoB htSsutafhWakZV945TnDqhR5Rc4rTcVSGNdFGFqoC/jzhxeO8fUpJgmrQBt9qJrK5sDY dZoQ== X-Gm-Message-State: APjAAAW0RQhPby0Ha/mmVV/s5P5qQ6NBh5Quv3IqrrWE7FVrzH0RfCYj 1Gbhy9FJWW4TzwA/FwWxwxlM1A== X-Google-Smtp-Source: APXvYqxMZQ2CgaEn9VNAFmSYHng/qFDULpwN5xe6U1SLeQ53mxYaRXuNmHztd/kqbirFZBDJVE2lzg== X-Received: by 2002:a5d:5190:: with SMTP id k16mr2329572wrv.10.1553615856848; Tue, 26 Mar 2019 08:57:36 -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.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 08:57: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 1/3] ARM: davinci: omapl138-hawk: add a fixed regulator for ohci-da8xx Date: Tue, 26 Mar 2019 16:57:26 +0100 Message-Id: <20190326155728.5432-2-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 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 48 +++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 0896af2bed24..ea7110e47e8a 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,14 +299,48 @@ 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 = 1, + .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.1", + .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 */ @@ -326,12 +361,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)