From patchwork Mon Jan 21 10:07:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Xie X-Patchwork-Id: 2010541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 9CA323FD1A for ; Mon, 21 Jan 2013 10:21:47 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxETA-0006CP-VM; Mon, 21 Jan 2013 10:19:13 +0000 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1TxEIv-0004nc-Fc for linux-arm-kernel@lists.infradead.org; Mon, 21 Jan 2013 10:08:39 +0000 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKUP0ToIR3RofY7XUOfF5y817pwrLj060r@postini.com; Mon, 21 Jan 2013 02:08:37 PST Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 21 Jan 2013 02:08:01 -0800 Received: from localhost (unknown [10.38.36.239]) by maili.marvell.com (Postfix) with ESMTP id 44A464E510; Mon, 21 Jan 2013 02:08:01 -0800 (PST) From: Chao Xie To: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, haojian.zhuang@gmail.com, stern@rowland.harvard.edu, balbi@ti.com, gregkh@linuxfoundation.org Subject: [V4 PATCH 26/26] usb: ehci: ehci-mv: add device tree support Date: Mon, 21 Jan 2013 05:07:44 -0500 Message-Id: <1358762864-9249-27-git-send-email-chao.xie@marvell.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1358762864-9249-1-git-send-email-chao.xie@marvell.com> References: <1358762864-9249-1-git-send-email-chao.xie@marvell.com> X-OriginalArrivalTime: 21 Jan 2013 10:08:01.0461 (UTC) FILETIME=[32142E50:01CDF7BF] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130121_050838_024305_8E1B52B3 X-CRM114-Status: GOOD ( 20.30 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.201 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Chao Xie X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org All blocks are removed. Add the device tree support for ehci. Signed-off-by: Chao Xie Acked-by: Alan Stern --- drivers/usb/host/ehci-mv.c | 105 +++++++++++++++++++++++++++++++++---------- 1 files changed, 80 insertions(+), 25 deletions(-) diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c index 171e145..79eca0c 100644 --- a/drivers/usb/host/ehci-mv.c +++ b/drivers/usb/host/ehci-mv.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -32,11 +33,9 @@ struct ehci_hcd_mv { struct usb_phy *otg; - struct mv_usb_platform_data *pdata; - /* clock source and total clock number */ unsigned int clknum; - struct clk *clk[0]; + struct clk **clk; }; static void ehci_clock_enable(struct ehci_hcd_mv *ehci_mv) @@ -138,22 +137,55 @@ static const struct hc_driver mv_ehci_hc_driver = { .bus_resume = ehci_bus_resume, }; +static int mv_ehci_parse_dt(struct platform_device *pdev, + struct ehci_hcd_mv *ehci_mv) +{ + struct device_node *np = pdev->dev.of_node; + unsigned int clks_num; + int i, ret; + const char *clk_name; + + if (!np) + return 1; + + clks_num = of_property_count_strings(np, "clocks"); + if (clks_num < 0) + return clks_num; + + ehci_mv->clk = devm_kzalloc(&pdev->dev, + sizeof(struct clk *) * clks_num, GFP_KERNEL); + if (ehci_mv->clk == NULL) + return -ENOMEM; + + for (i = 0; i < clks_num; i++) { + ret = of_property_read_string_index(np, "clocks", i, + &clk_name); + if (ret) + return ret; + ehci_mv->clk[i] = clk_get(NULL, clk_name); + if (IS_ERR(ehci_mv->clk[i])) + return PTR_ERR(ehci_mv->clk[i]); + } + + ehci_mv->clknum = clks_num; + + ret = of_property_read_u32(np, "mode", &ehci_mv->mode); + if (ret) + return ret; + + return 0; +} + static int mv_ehci_probe(struct platform_device *pdev) { - struct mv_usb_platform_data *pdata = pdev->dev.platform_data; struct usb_hcd *hcd; struct ehci_hcd *ehci; struct ehci_hcd_mv *ehci_mv; struct resource *r; - int clk_i, retval = -ENODEV; + int retval = -ENODEV; u32 offset; size_t size; - if (!pdata) { - dev_err(&pdev->dev, "missing platform_data\n"); - return -ENODEV; - } - if (usb_disabled()) return -ENODEV; @@ -161,7 +193,7 @@ static int mv_ehci_probe(struct platform_device *pdev) if (!hcd) return -ENOMEM; - size = sizeof(*ehci_mv) + sizeof(struct clk *) * pdata->clknum; + size = sizeof(*ehci_mv); ehci_mv = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); if (ehci_mv == NULL) { dev_err(&pdev->dev, "cannot allocate ehci_hcd_mv\n"); @@ -170,19 +202,36 @@ static int mv_ehci_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, ehci_mv); - ehci_mv->pdata = pdata; ehci_mv->hcd = hcd; - ehci_mv->clknum = pdata->clknum; - for (clk_i = 0; clk_i < ehci_mv->clknum; clk_i++) { - ehci_mv->clk[clk_i] = - devm_clk_get(&pdev->dev, pdata->clkname[clk_i]); - if (IS_ERR(ehci_mv->clk[clk_i])) { - dev_err(&pdev->dev, "error get clck \"%s\"\n", - pdata->clkname[clk_i]); - retval = PTR_ERR(ehci_mv->clk[clk_i]); - goto err_clear_drvdata; + retval = mv_ehci_parse_dt(pdev, ehci_mv); + if (retval > 0) { + struct mv_usb_platform_data *pdata = pdev->dev.platform_data; + int clk_i = 0; + + /* no CONFIG_OF */ + if (pdata == NULL) { + dev_err(&pdev->dev, "missing platform_data\n"); + return -ENODEV; + } + ehci_mv->mode = pdata->mode; + ehci_mv->clknum = pdata->clknum; + + size = sizeof(struct clk *) * ehci_mv->clknum; + ehci_mv->clk = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); + if (ehci_mv->clk == NULL) + return -ENOMEM; + for (clk_i = 0; clk_i < ehci_mv->clknum; clk_i++) { + ehci_mv->clk[clk_i] = devm_clk_get(&pdev->dev, + pdata->clkname[clk_i]); + if (IS_ERR(ehci_mv->clk[clk_i])) { + retval = PTR_ERR(ehci_mv->clk[clk_i]); + return retval; + } } + } else if (retval < 0) { + dev_err(&pdev->dev, "error parse dt\n"); + return retval; } r = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -230,7 +279,6 @@ static int mv_ehci_probe(struct platform_device *pdev) ehci = hcd_to_ehci(hcd); ehci->caps = (struct ehci_caps *) ehci_mv->cap_regs; - ehci_mv->mode = pdata->mode; if (ehci_mv->mode == MV_USB_MODE_OTG) { #ifdef CONFIG_USB_OTG_UTILS ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2); @@ -334,13 +382,20 @@ static void mv_ehci_shutdown(struct platform_device *pdev) hcd->driver->shutdown(hcd); } +static struct of_device_id mv_ehci_dt_ids[] = { + { .compatible = "mrvl,mv-ehci" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, mv_ehci_dt_ids); + static struct platform_driver ehci_mv_driver = { .probe = mv_ehci_probe, .remove = mv_ehci_remove, .shutdown = mv_ehci_shutdown, .driver = { - .name = "mv-ehci", - .bus = &platform_bus_type, - }, + .name = "mv-ehci", + .bus = &platform_bus_type, + .of_match_table = mv_ehci_dt_ids, + }, .id_table = ehci_id_table, };