From patchwork Wed Nov 16 10:52:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9431265 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CD8C96047D for ; Wed, 16 Nov 2016 10:54:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4B0728EFC for ; Wed, 16 Nov 2016 10:54:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6EF428F01; Wed, 16 Nov 2016 10:54:40 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3172C28EFC for ; Wed, 16 Nov 2016 10:54:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c6xpu-0001ir-Af; Wed, 16 Nov 2016 10:53:02 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c6xpn-0001NJ-PT for linux-arm-kernel@lists.infradead.org; Wed, 16 Nov 2016 10:52:57 +0000 Received: by mail-wm0-x22f.google.com with SMTP id a197so230889778wmd.0 for ; Wed, 16 Nov 2016 02:52:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0APbmsKA3i48TdX5m9L3d0MFyCuWKXXz/OopgV1r+G8=; b=hzaGjyFWDO1dE6LmvIWBfjHGIBNX9Lg+MnS+pcjMEAe67x4dOgmtmOrdjOh0brR0+V nw9TK8kxqVTpU/FgQbIhGKA+trJr0cqi9U5pdriGljl3en62IcYs+Asx12ZjYxkMMpIq eCQIVqvrGoH84hN1aPWX3DIVqQVh/dxBaGrqbk+T01fajFKTwdfb//SEdeiqeUXDZBn6 9ZtVDyFvm7+92Un9d9lEzlyzCkNsnfrfbFF3LkyfXc5Nd16fjeA0lvehTFNf2Tdkh4GW flSFuzespeS9exgaf+5UswmFADaGPmMyPsUCgQClpBrqtfB/j+CwDMkIePjpTxx3qQvc rqmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0APbmsKA3i48TdX5m9L3d0MFyCuWKXXz/OopgV1r+G8=; b=BRRl568x6cE8+Y409L23eAqkJmXAlUMYWSaF2mxjw6E4ixs8r1Bq6oJlup1HM4BFb1 oKCEy5w/DfeMznrGAokkHh4Fnt7rhIFzMhiCxLVBsQrThnvpMfquF8L6AMn8vf9SOarC Z/eqeUw7aoa48WwahPsihZiYJXAZv1RGvGISoOfrevF39CGZMwdQpAU2zjnSRjh8Zpv2 2hAt+HyaKvUPZOEOie5JEm8i0lKp7i1t6J4+dUm+wD8FvQzTdWM8iIeuBWNfdW5uqjCe CNi0/z4H9DqbwbVAZix07fTBi37YRz+BpKFN6jda7ejdibo2Q1dWb+pEeLRkm14VQVnT YpJg== X-Gm-Message-State: ABUngvcY6YGJPDsW+qqXyNl4Oc8w+CMMQuQ+xio8zHGBIXvq/R2e7wRq7AM1e5j3nWlvCs0p X-Received: by 10.28.126.11 with SMTP id z11mr9881415wmc.87.1479293557423; Wed, 16 Nov 2016 02:52:37 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id m9sm9444479wma.0.2016.11.16.02.52.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Nov 2016 02:52:37 -0800 (PST) From: Alexandre Bailon To: khilman@baylibre.com, robh+dt@kernel.org, b-liu@ti.com Subject: [PATCH v5 3/3] usb: musb: da8xx: Add DT support for the DA8xx driver Date: Wed, 16 Nov 2016 11:52:25 +0100 Message-Id: <1479293545-7516-4-git-send-email-abailon@baylibre.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1479293545-7516-1-git-send-email-abailon@baylibre.com> References: <1479293545-7516-1-git-send-email-abailon@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161116_025256_066076_C467B871 X-CRM114-Status: GOOD ( 14.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-usb@vger.kernel.org, nsekhar@ti.com, linux-kernel@vger.kernel.org, Petr Kulhavy , Alexandre Bailon , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Petr Kulhavy This adds DT support for TI DA8xx/OMAP-L1x/AM17xx/AM18xx MUSB driver Signed-off-by: Petr Kulhavy Signed-off-by: Alexandre Bailon Tested-by: David Lechner --- drivers/usb/musb/da8xx.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index 2440f88..f205a03 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c @@ -6,6 +6,9 @@ * Based on the DaVinci "glue layer" code. * Copyright (C) 2005-2006 by Texas Instruments * + * DT support + * Copyright (c) 2016 Petr Kulhavy + * * This file is part of the Inventra Controller Driver for Linux. * * The Inventra Controller Driver for Linux is free software; you @@ -433,6 +436,21 @@ static int da8xx_musb_exit(struct musb *musb) return 0; } +static inline u8 get_vbus_power(struct device *dev) +{ + struct regulator *vbus_supply; + int current_uA; + + vbus_supply = regulator_get_optional(dev, "vbus"); + if (IS_ERR(vbus_supply)) + return 255; + current_uA = regulator_get_current_limit(vbus_supply); + regulator_put(vbus_supply); + if (current_uA <= 0 || current_uA > 510000) + return 255; + return current_uA / 1000 / 2; +} + static const struct musb_platform_ops da8xx_ops = { .quirks = MUSB_DMA_CPPI | MUSB_INDEXED_EP, .init = da8xx_musb_init, @@ -458,6 +476,12 @@ static const struct platform_device_info da8xx_dev_info = { .dma_mask = DMA_BIT_MASK(32), }; +static const struct musb_hdrc_config da8xx_config = { + .ram_bits = 10, + .num_eps = 5, + .multipoint = 1, +}; + static int da8xx_probe(struct platform_device *pdev) { struct resource musb_resources[2]; @@ -465,6 +489,7 @@ static int da8xx_probe(struct platform_device *pdev) struct da8xx_glue *glue; struct platform_device_info pinfo; struct clk *clk; + struct device_node *np = pdev->dev.of_node; int ret; glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL); @@ -487,6 +512,16 @@ static int da8xx_probe(struct platform_device *pdev) glue->dev = &pdev->dev; glue->clk = clk; + if (IS_ENABLED(CONFIG_OF) && np) { + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + + pdata->config = &da8xx_config; + pdata->mode = musb_get_mode(&pdev->dev); + pdata->power = get_vbus_power(&pdev->dev); + } + pdata->platform_ops = &da8xx_ops; glue->usb_phy = usb_phy_generic_register(); @@ -537,11 +572,22 @@ static int da8xx_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id da8xx_id_table[] = { + { + .compatible = "ti,da830-musb", + }, + {}, +}; +MODULE_DEVICE_TABLE(of, da8xx_id_table); +#endif + static struct platform_driver da8xx_driver = { .probe = da8xx_probe, .remove = da8xx_remove, .driver = { .name = "musb-da8xx", + .of_match_table = of_match_ptr(da8xx_id_table), }, };