From: peter.chen@freescale.com (Peter Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 6/7] usb: chipidea: usbmisc: add mx53 support
Date: Fri, 23 Nov 2012 14:53:41 +0800 [thread overview]
Message-ID: <20121123065340.GD22420@nchen-desktop> (raw)
In-Reply-To: <1353506793-8354-7-git-send-email-m.grzeschik@pengutronix.de>
On Wed, Nov 21, 2012 at 03:06:32PM +0100, Michael Grzeschik wrote:
> This adds mx53 as the next user of the usbmisc driver and makes it
> possible to disable the overcurrent-detection of the internal phy.
>
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> Changes since v2:
> * added defines for register offsets and bitmasks
> * fixed disable_oc option for all ports
>
> drivers/usb/chipidea/usbmisc_imx.c | 51 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 51 insertions(+)
>
> diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
> index e090e0f..b1811df 100644
> --- a/drivers/usb/chipidea/usbmisc_imx.c
> +++ b/drivers/usb/chipidea/usbmisc_imx.c
> @@ -19,6 +19,13 @@
>
> #define USB_DEV_MAX 4
>
> +#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 MX6_BM_OVER_CUR_DIS BIT(7)
As every SoC platform's non-core register mapping is different,
it is better to use .h to put register bit definition
>
> struct imx_usbmisc {
> @@ -54,6 +61,45 @@ static struct usbmisc_usb_device *get_usbdev(struct device *dev)
> return &usbmisc->usbdev[i];
> }
>
> +static int usbmisc_imx53_init(struct device *dev)
> +{
> + struct usbmisc_usb_device *usbdev;
> + void __iomem *reg;
> + unsigned long flags;
> + u32 val;
> +
> + usbdev = get_usbdev(dev);
> + if (IS_ERR(usbdev))
> + return PTR_ERR(usbdev);
> +
> + if (usbdev->disable_oc) {
> + spin_lock_irqsave(&usbmisc->lock, flags);
> + switch (usbdev->index) {
> + case 0:
> + reg = usbmisc->base + 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;
> + val = readl(reg) | MX53_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;
> + break;
> + case 3:
> + reg = usbmisc->base + MX53_USB_UH3_CTRL_OFFSET;
> + val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
> + break;
> + }
> + if (reg && val)
> + writel(val, reg);
> + spin_unlock_irqrestore(&usbmisc->lock, flags);
> + }
> +
> + return 0;
> +}
> +
> static int usbmisc_imx6q_init(struct device *dev)
> {
>
> @@ -76,11 +122,16 @@ static int usbmisc_imx6q_init(struct device *dev)
> return 0;
> }
>
> +static const struct usbmisc_ops imx53_usbmisc_ops = {
> + .init = usbmisc_imx53_init,
> +};
> +
> static const struct usbmisc_ops imx6q_usbmisc_ops = {
> .init = usbmisc_imx6q_init,
> };
>
> static const struct of_device_id usbmisc_imx_dt_ids[] = {
> + { .compatible = "fsl,imx53-usbmisc", .data = (void *)&imx53_usbmisc_ops },
> { .compatible = "fsl,imx6q-usbmisc", .data = (void *)&imx6q_usbmisc_ops },
> { /* sentinel */ }
> };
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Best Regards,
Peter Chen
next prev parent reply other threads:[~2012-11-23 6:53 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-21 14:06 [PATCH v3 0/7] support other fsl SoCs with usbmisc + small fixes Michael Grzeschik
2012-11-21 14:06 ` [PATCH v3 1/7] usb: chipidea: usbmisc: rename file, struct and functions to usbmisc_imx Michael Grzeschik
2012-11-21 14:06 ` [PATCH v3 2/7] usb: chipidea: usbmisc: unset global varibale usbmisc on driver remove Michael Grzeschik
2012-11-21 14:06 ` [PATCH v3 3/7] usb: chipidea: usbmisc: fix a potential race condition Michael Grzeschik
2012-11-23 5:36 ` Peter Chen
2012-11-23 7:37 ` Sascha Hauer
2012-11-23 9:01 ` Alexander Shishkin
2012-11-23 10:00 ` Marc Kleine-Budde
2012-11-21 14:06 ` [PATCH v3 4/7] usb: chipidea: usbmisc: prepare driver to handle more than one soc Michael Grzeschik
2012-11-21 14:06 ` [PATCH v3 5/7] usb: chipidea: usbmisc: add support for ahb, ipg and per clock Michael Grzeschik
2012-11-23 6:51 ` Peter Chen
2012-11-23 16:20 ` Michael Grzeschik
2012-11-25 9:18 ` Peter Chen
2012-11-26 15:44 ` Michael Grzeschik
2012-11-21 14:06 ` [PATCH v3 6/7] usb: chipidea: usbmisc: add mx53 support Michael Grzeschik
2012-11-21 20:28 ` Sergei Shtylyov
2012-11-21 19:58 ` Michael Grzeschik
2012-11-23 6:53 ` Peter Chen [this message]
2012-11-23 7:39 ` Sascha Hauer
2012-11-25 8:05 ` Peter Chen
2012-11-23 10:02 ` Marc Kleine-Budde
2012-11-25 8:09 ` Peter Chen
2012-11-26 15:40 ` Grant Likely
2012-11-21 14:06 ` [PATCH v3 7/7] usb: chipidea: usbmisc: add post handling and errata fix for mx25 Michael Grzeschik
2012-11-23 6:59 ` Peter Chen
2012-11-22 9:24 ` [PATCH v3 0/7] support other fsl SoCs with usbmisc + small fixes Alexander Shishkin
2012-11-22 9:31 ` Peter Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121123065340.GD22420@nchen-desktop \
--to=peter.chen@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).