From patchwork Sun Nov 10 07:18:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 3165031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 69D8AC045B for ; Sun, 10 Nov 2013 10:17:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 844D420265 for ; Sun, 10 Nov 2013 10:17:01 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 69D1520263 for ; Sun, 10 Nov 2013 10:17:00 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VfS1y-0000cV-C9; Sun, 10 Nov 2013 10:14:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VfPLq-0007p7-M4; Sun, 10 Nov 2013 07:22:30 +0000 Received: from fallback4.mail.ru ([94.100.176.42]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VfPJ7-0007nR-IB for linux-arm-kernel@lists.infradead.org; Sun, 10 Nov 2013 07:19:43 +0000 Received: from smtp34.i.mail.ru (smtp34.i.mail.ru [94.100.177.94]) by fallback4.mail.ru (mPOP.Fallback_MX) with ESMTP id EF69615C32B for ; Sun, 10 Nov 2013 11:19:10 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=E4MhBClWqbGxy5bcd35YIvjqpFO4UVNkevIU4kd95rA=; b=B9qu/6tkavEoJMJjW5T6faEHQKaBfHW4tb+HGHzoYMN7SQcL2DALL3VlKp3wAWnEJk9Tf2ejeeiBBanS9m5Ol56ihQUHMWWFsE5GKHONw7+G7izAbi5XQ+CLSE8Lgs8Lm2v/0R+HvqOSLJ6NU1DgbCR9eg9wBfM04l43sx0FdaI=; Received: from [188.134.40.128] (port=39664 helo=shc.zet) by smtp34.i.mail.ru with esmtpa (envelope-from ) id 1VfPIL-0003im-Jo; Sun, 10 Nov 2013 11:18:53 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU Date: Sun, 10 Nov 2013 11:18:21 +0400 Message-Id: <1384067901-9377-2-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1384067901-9377-1-git-send-email-shc_work@mail.ru> References: <1384067901-9377-1-git-send-email-shc_work@mail.ru> X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131110_021942_065131_86720AC1 X-CRM114-Status: GOOD ( 12.92 ) X-Spam-Score: -2.0 (--) Cc: Alexander Shishkin , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Alexander Shiyan , Sascha Hauer X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID, 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 i.MX51 as the next user of the usbmisc driver. Since the functional is similar i.MX53, we just rename the definitions and add an alias for the new CPU. Signed-off-by: Alexander Shiyan Acked-by: Peter Chen --- drivers/usb/chipidea/usbmisc_imx.c | 40 +++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c index 4381c5a6..f348ebb 100644 --- a/drivers/usb/chipidea/usbmisc_imx.c +++ b/drivers/usb/chipidea/usbmisc_imx.c @@ -25,12 +25,12 @@ #define MX27_H2_PM_BIT BIT(16) #define MX27_OTG_PM_BIT BIT(24) -#define MX53_USB_OTG_PHY_CTRL_0_OFFSET 0x08 -#define MX53_USB_UH2_CTRL_OFFSET 0x14 -#define MX53_USB_UH3_CTRL_OFFSET 0x18 -#define MX53_BM_OVER_CUR_DIS_H1 BIT(5) -#define MX53_BM_OVER_CUR_DIS_OTG BIT(8) -#define MX53_BM_OVER_CUR_DIS_UHx BIT(30) +#define MX5_USB_OTG_PHY_CTRL_0_OFFSET 0x08 +#define MX5_USB_UH2_CTRL_OFFSET 0x14 +#define MX5_USB_UH3_CTRL_OFFSET 0x18 +#define MX5_BM_OVER_CUR_DIS_H1 BIT(5) +#define MX5_BM_OVER_CUR_DIS_OTG BIT(8) +#define MX5_BM_OVER_CUR_DIS_UHx BIT(30) #define MX6_BM_OVER_CUR_DIS BIT(7) @@ -102,7 +102,7 @@ static int usbmisc_imx27_init(struct imx_usbmisc_data *data) return 0; } -static int usbmisc_imx53_init(struct imx_usbmisc_data *data) +static int usbmisc_imx5_init(struct imx_usbmisc_data *data) { void __iomem *reg = NULL; unsigned long flags; @@ -115,20 +115,20 @@ static int usbmisc_imx53_init(struct imx_usbmisc_data *data) spin_lock_irqsave(&usbmisc->lock, flags); switch (data->index) { case 0: - reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET; - val = readl(reg) | MX53_BM_OVER_CUR_DIS_OTG; + reg = usbmisc->base + MX5_USB_OTG_PHY_CTRL_0_OFFSET; + val = readl(reg) | MX5_BM_OVER_CUR_DIS_OTG; break; case 1: - reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET; - val = readl(reg) | MX53_BM_OVER_CUR_DIS_H1; + reg = usbmisc->base + MX5_USB_OTG_PHY_CTRL_0_OFFSET; + val = readl(reg) | MX5_BM_OVER_CUR_DIS_H1; break; case 2: - reg = usbmisc->base + MX53_USB_UH2_CTRL_OFFSET; - val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx; + reg = usbmisc->base + MX5_USB_UH2_CTRL_OFFSET; + val = readl(reg) | MX5_BM_OVER_CUR_DIS_UHx; break; case 3: - reg = usbmisc->base + MX53_USB_UH3_CTRL_OFFSET; - val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx; + reg = usbmisc->base + MX5_USB_UH3_CTRL_OFFSET; + val = readl(reg) | MX5_BM_OVER_CUR_DIS_UHx; break; } if (reg && val) @@ -166,8 +166,8 @@ static const struct usbmisc_ops imx27_usbmisc_ops = { .init = usbmisc_imx27_init, }; -static const struct usbmisc_ops imx53_usbmisc_ops = { - .init = usbmisc_imx53_init, +static const struct usbmisc_ops imx5_usbmisc_ops = { + .init = usbmisc_imx5_init, }; static const struct usbmisc_ops imx6q_usbmisc_ops = { @@ -204,8 +204,12 @@ static const struct of_device_id usbmisc_imx_dt_ids[] = { .data = &imx27_usbmisc_ops, }, { + .compatible = "fsl,imx51-usbmisc", + .data = &imx5_usbmisc_ops, + }, + { .compatible = "fsl,imx53-usbmisc", - .data = &imx53_usbmisc_ops, + .data = &imx5_usbmisc_ops, }, { .compatible = "fsl,imx6q-usbmisc",