From patchwork Tue Oct 25 14:39:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 79191 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp3150960qge; Tue, 25 Oct 2016 07:39:57 -0700 (PDT) X-Received: by 10.98.7.83 with SMTP id b80mr40013880pfd.181.1477406397648; Tue, 25 Oct 2016 07:39:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t2si21045726pgn.273.2016.10.25.07.39.57; Tue, 25 Oct 2016 07:39:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754295AbcJYOjw (ORCPT + 7 others); Tue, 25 Oct 2016 10:39:52 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:36865 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758752AbcJYOjh (ORCPT ); Tue, 25 Oct 2016 10:39:37 -0400 Received: by mail-wm0-f42.google.com with SMTP id c78so28161143wme.0 for ; Tue, 25 Oct 2016 07:39:16 -0700 (PDT) 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=RZSE2ztIVR0/DUDI+AHshsTQBCZZ80MQGXXWsErH86I=; b=YyOVy0m7nvkOfumrjd6sHFW/P/yuh6OLn3buNAwYcEmIoRG0Np57VAIoGMKOIrEiQx Wo7z5mhfLP+AcqXM2RckL01U+sGVdQVvnf1+kW9IJSy2XJ6Lo7S83U7yL6IArJt2JpAw 6FG/t0VbzJvvpQ+578F8Eqd2L34mlhjgSc0QYB2LfxM9aGUVj0EjndpI0p+9laVq3YX6 +VIzXy2ezb7NcvRC61poUPUBWRuj9twb6y1dqw0E59Hb7dvKfpOh9zbqqhEtXl629oVc gWDhsHEZgOy1Oc/AFhu8jifU+dSM8o+Ceizx0VjdGGM6ZKY+7g7dMxC5TCNUH6jNXgU5 QcMg== 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=RZSE2ztIVR0/DUDI+AHshsTQBCZZ80MQGXXWsErH86I=; b=flrdNntplwzakt/ajwRjQs/EOlrLSkufLpyb9wY+bUMmT7w6P5XVMDCeYfKXQVq86G IMP2FMh2rPQ4vYPRvwQS8bE6CDUQ0maOMpnbTz+DwS57isubCUkh8JofIsOr2d83evN8 vg0AzaKDy58ZFqlvQ0BW9Cij1N4rBeUlXug4waR9yIwiRIhTdpmOWJ10z5r8dvT/0Dmn LPMaLnFJANG/dPQORaTx5ykKohEOAC+HGpqrsUwd1ztSylEf+5OY0DCGAH4V7lqO4/hS OlJySE36ftn83cg7R8axM9KaKEfed4hI45sz90/Qmuzjj0GxGZEgBx7K0SNq2vYVaBLb q8jw== X-Gm-Message-State: ABUngvefeWQhFtOyr8kaFIl4kgpTu6FKksFmZ68rfu2Nh5kEAcTK84LvytVmgPUYP6hm/OV7 X-Received: by 10.28.134.74 with SMTP id i71mr3445588wmd.100.1477406355959; Tue, 25 Oct 2016 07:39:15 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id r72sm4030723wmd.21.2016.10.25.07.39.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 07:39:15 -0700 (PDT) From: Alexandre Bailon To: khilman@baylibre.com, robh+dt@kernel.org, b-liu@ti.com Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Petr Kulhavy , Alexandre Bailon Subject: [PATCH 3/4] usb: musb: da8xx: Add DT support for the DA8xx driver Date: Tue, 25 Oct 2016 16:39:04 +0200 Message-Id: <1477406345-27192-4-git-send-email-abailon@baylibre.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1477406345-27192-1-git-send-email-abailon@baylibre.com> References: <1477406345-27192-1-git-send-email-abailon@baylibre.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 --- drivers/usb/musb/da8xx.c | 76 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 67 insertions(+), 9 deletions(-) -- 2.7.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index 210b7e4..d465087 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,7 +489,9 @@ 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; + struct resource *res; glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL); if (!glue) @@ -486,6 +512,18 @@ 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) { + /* FIXME */ + 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(); @@ -499,15 +537,21 @@ static int da8xx_probe(struct platform_device *pdev) memset(musb_resources, 0x00, sizeof(*musb_resources) * ARRAY_SIZE(musb_resources)); - musb_resources[0].name = pdev->resource[0].name; - musb_resources[0].start = pdev->resource[0].start; - musb_resources[0].end = pdev->resource[0].end; - musb_resources[0].flags = pdev->resource[0].flags; + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "failed to get memory.\n"); + ret = -EINVAL; + goto err_unregister_usb_phy; + } + musb_resources[0] = *res; - musb_resources[1].name = pdev->resource[1].name; - musb_resources[1].start = pdev->resource[1].start; - musb_resources[1].end = pdev->resource[1].end; - musb_resources[1].flags = pdev->resource[1].flags; + res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (!res) { + dev_err(&pdev->dev, "failed to get irq.\n"); + ret = -EINVAL; + goto err_unregister_usb_phy; + } + musb_resources[1] = *res; pinfo = da8xx_dev_info; pinfo.parent = &pdev->dev; @@ -520,9 +564,14 @@ static int da8xx_probe(struct platform_device *pdev) ret = PTR_ERR_OR_ZERO(glue->musb); if (ret) { dev_err(&pdev->dev, "failed to register musb device: %d\n", ret); - usb_phy_generic_unregister(glue->usb_phy); + goto err_unregister_usb_phy; } + return 0; + +err_unregister_usb_phy: + usb_phy_generic_unregister(glue->usb_phy); + return ret; } @@ -536,11 +585,20 @@ static int da8xx_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id da8xx_id_table[] = { + { + .compatible = "ti,da830-musb", + }, + {}, +}; +MODULE_DEVICE_TABLE(of, da8xx_id_table); + 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), }, };