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@xxxxxxxxxxxxxx>
> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Best Regards,
Peter Chen
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
