From patchwork Fri Jul 18 17:01:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Agner X-Patchwork-Id: 4586621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3CF0F9F37C for ; Fri, 18 Jul 2014 17:04:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B1D520125 for ; Fri, 18 Jul 2014 17:04:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17FE520122 for ; Fri, 18 Jul 2014 17:04:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X8BYS-0002PI-7Q; Fri, 18 Jul 2014 17:02:44 +0000 Received: from mail.kmu-office.ch ([178.209.48.102]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X8BXu-0002AH-Fh for linux-arm-kernel@lists.infradead.org; Fri, 18 Jul 2014 17:02:11 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.kmu-office.ch (Postfix) with ESMTP id 02B636B599 for ; Fri, 18 Jul 2014 19:01:53 +0200 (CEST) X-Virus-Scanned: by amavisd-new at kmu-office.ch Received: from mail.kmu-office.ch ([127.0.0.1]) by localhost (mail.kmu-office.ch [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OpWwvZJrdiSq for ; Fri, 18 Jul 2014 19:01:52 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.kmu-office.ch (Postfix) with ESMTP id BDEE56B597 for ; Fri, 18 Jul 2014 19:01:50 +0200 (CEST) Received: from trochilidae.toradex.int (unknown [46.140.72.82]) (Authenticated sender: stefan@agner.ch) by mail.kmu-office.ch (Postfix) with ESMTPSA id 3B3236B596; Fri, 18 Jul 2014 19:01:50 +0200 (CEST) From: Stefan Agner To: peter.chen@freescale.com, s.hauer@pengutronix.de, shawn.guo@freescale.com Subject: [PATCH 4/6] chipidea: usbmisc_imx: Add USB support for VF610 SoCs Date: Fri, 18 Jul 2014 19:01:40 +0200 Message-Id: X-Mailer: git-send-email 2.0.1 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140718_100210_853786_CEFB32C9 X-CRM114-Status: GOOD ( 19.56 ) X-Spam-Score: 0.0 (/) Cc: b35083@freescale.com, stefan@agner.ch, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds Vybrid VF610 SoC support. The IP is very similar to i.MX6, however the non-core registers are spread in two different register areas. Hence we support multiple registers which are addressed by the index of usbmisc. Signed-off-by: Stefan Agner --- I tried first to create two usbmisc nodes and hoped it would instanciate the driver twice, however, the driver currently only supports one instance. In an short attempt to add support for that, I realized that since the data structure holding the information for each instance is within the driver ci_hdrc_imx. For Vybrid two instances would make much more sense, however, a i.MX6Q shares all the non-core registers in one register area, hence only one driver can map this area. I ended up with this multiple registers solution, altough for the Vybrid multiple instances would probably make more sense. Any thoughts on this? drivers/usb/chipidea/usbmisc_imx.c | 76 +++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 22 deletions(-) diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c index 85293b8..61c2350 100644 --- a/drivers/usb/chipidea/usbmisc_imx.c +++ b/drivers/usb/chipidea/usbmisc_imx.c @@ -57,6 +57,10 @@ #define MX6_BM_OVER_CUR_DIS BIT(7) +#define VF610_OVER_CUR_DIS BIT(7) + +#define MAX_BASE_ADDR 2 + struct usbmisc_ops { /* It's called once when probe a usb device */ int (*init)(struct imx_usbmisc_data *data); @@ -65,7 +69,7 @@ struct usbmisc_ops { }; struct imx_usbmisc { - void __iomem *base; + void __iomem *base[MAX_BASE_ADDR]; spinlock_t lock; struct clk *clk; const struct usbmisc_ops *ops; @@ -84,20 +88,20 @@ static int usbmisc_imx25_init(struct imx_usbmisc_data *data) spin_lock_irqsave(&usbmisc->lock, flags); switch (data->index) { case 0: - val = readl(usbmisc->base); + val = readl(usbmisc->base[0]); val &= ~(MX25_OTG_SIC_MASK | MX25_OTG_PP_BIT); val |= (MX25_EHCI_INTERFACE_DIFF_UNI & MX25_EHCI_INTERFACE_MASK) << MX25_OTG_SIC_SHIFT; val |= (MX25_OTG_PM_BIT | MX25_OTG_OCPOL_BIT); - writel(val, usbmisc->base); + writel(val, usbmisc->base[0]); break; case 1: - val = readl(usbmisc->base); + val = readl(usbmisc->base[0]); val &= ~(MX25_H1_SIC_MASK | MX25_H1_PP_BIT | MX25_H1_IPPUE_UP_BIT); val |= (MX25_EHCI_INTERFACE_SINGLE_UNI & MX25_EHCI_INTERFACE_MASK) << MX25_H1_SIC_SHIFT; val |= (MX25_H1_PM_BIT | MX25_H1_OCPOL_BIT | MX25_H1_TLL_BIT | MX25_H1_USBTE_BIT | MX25_H1_IPPUE_DOWN_BIT); - writel(val, usbmisc->base); + writel(val, usbmisc->base[0]); break; } @@ -115,7 +119,7 @@ static int usbmisc_imx25_post(struct imx_usbmisc_data *data) if (data->index > 2) return -EINVAL; - reg = usbmisc->base + MX25_USB_PHY_CTRL_OFFSET; + reg = usbmisc->base[0] + MX25_USB_PHY_CTRL_OFFSET; if (data->evdo) { spin_lock_irqsave(&usbmisc->lock, flags); @@ -149,10 +153,10 @@ static int usbmisc_imx27_init(struct imx_usbmisc_data *data) spin_lock_irqsave(&usbmisc->lock, flags); if (data->disable_oc) - val = readl(usbmisc->base) | val; + val = readl(usbmisc->base[0]) | val; else - val = readl(usbmisc->base) & ~val; - writel(val, usbmisc->base); + val = readl(usbmisc->base[0]) & ~val; + writel(val, usbmisc->base[0]); spin_unlock_irqrestore(&usbmisc->lock, flags); return 0; @@ -168,29 +172,29 @@ static int usbmisc_imx53_init(struct imx_usbmisc_data *data) return -EINVAL; /* Select a 24 MHz reference clock for the PHY */ - reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_1_OFFSET; + reg = usbmisc->base[0] + MX53_USB_OTG_PHY_CTRL_1_OFFSET; val = readl(reg); val &= ~MX53_USB_PHYCTRL1_PLLDIV_MASK; val |= MX53_USB_PLL_DIV_24_MHZ; - writel(val, usbmisc->base + MX53_USB_OTG_PHY_CTRL_1_OFFSET); + writel(val, usbmisc->base[0] + MX53_USB_OTG_PHY_CTRL_1_OFFSET); if (data->disable_oc) { spin_lock_irqsave(&usbmisc->lock, flags); switch (data->index) { case 0: - reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET; + reg = usbmisc->base[0] + MX53_USB_OTG_PHY_CTRL_0_OFFSET; val = readl(reg) | MX53_BM_OVER_CUR_DIS_OTG; break; case 1: - reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET; + reg = usbmisc->base[0] + MX53_USB_OTG_PHY_CTRL_0_OFFSET; val = readl(reg) | MX53_BM_OVER_CUR_DIS_H1; break; case 2: - reg = usbmisc->base + MX53_USB_UH2_CTRL_OFFSET; + reg = usbmisc->base[0] + MX53_USB_UH2_CTRL_OFFSET; val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx; break; case 3: - reg = usbmisc->base + MX53_USB_UH3_CTRL_OFFSET; + reg = usbmisc->base[0] + MX53_USB_UH3_CTRL_OFFSET; val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx; break; } @@ -212,15 +216,31 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data) if (data->disable_oc) { spin_lock_irqsave(&usbmisc->lock, flags); - reg = readl(usbmisc->base + data->index * 4); + reg = readl(usbmisc->base[0] + data->index * 4); writel(reg | MX6_BM_OVER_CUR_DIS, - usbmisc->base + data->index * 4); + usbmisc->base[0] + data->index * 4); spin_unlock_irqrestore(&usbmisc->lock, flags); } return 0; } +static int usbmisc_vf610_init(struct imx_usbmisc_data *data) +{ + u32 reg; + + if (data->index >= 2) + return -EINVAL; + + if (data->disable_oc) { + reg = readl(usbmisc->base[data->index]); + writel(reg | VF610_OVER_CUR_DIS, + usbmisc->base[data->index]); + } + + return 0; +} + static const struct usbmisc_ops imx25_usbmisc_ops = { .init = usbmisc_imx25_init, .post = usbmisc_imx25_post, @@ -238,6 +258,10 @@ static const struct usbmisc_ops imx6q_usbmisc_ops = { .init = usbmisc_imx6q_init, }; +static const struct usbmisc_ops vf610_usbmisc_ops = { + .init = usbmisc_vf610_init, +}; + int imx_usbmisc_init(struct imx_usbmisc_data *data) { if (!usbmisc) @@ -283,6 +307,10 @@ static const struct of_device_id usbmisc_imx_dt_ids[] = { .compatible = "fsl,imx6q-usbmisc", .data = &imx6q_usbmisc_ops, }, + { + .compatible = "fsl,vf610-usbmisc", + .data = &vf610_usbmisc_ops, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, usbmisc_imx_dt_ids); @@ -291,7 +319,7 @@ static int usbmisc_imx_probe(struct platform_device *pdev) { struct resource *res; struct imx_usbmisc *data; - int ret; + int ret, i; struct of_device_id *tmp_dev; if (usbmisc) @@ -303,10 +331,14 @@ static int usbmisc_imx_probe(struct platform_device *pdev) spin_lock_init(&data->lock); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - data->base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(data->base)) - return PTR_ERR(data->base); + for (i = 0; i < MAX_BASE_ADDR; i++) { + res = platform_get_resource(pdev, IORESOURCE_MEM, i); + data->base[i] = devm_ioremap_resource(&pdev->dev, res); + + /* First base address is mandatory */ + if (IS_ERR(data->base) && !i) + return PTR_ERR(data->base); + } data->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(data->clk)) {