* [PATCH v2 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU
2013-11-26 15:36 [PATCH v2 1/2] usb: chipidea: usbmisc: Add support for i.MX27/i.MX31 CPUs Alexander Shiyan
@ 2013-11-26 15:36 ` Alexander Shiyan
2013-11-28 2:28 ` Shawn Guo
` (2 more replies)
2013-11-29 8:46 ` [PATCH v2 1/2] usb: chipidea: usbmisc: Add support for i.MX27/i.MX31 CPUs Peter Chen
` (2 subsequent siblings)
3 siblings, 3 replies; 9+ messages in thread
From: Alexander Shiyan @ 2013-11-26 15:36 UTC (permalink / raw)
To: linux-arm-kernel
This adds i.MX51 as the next user of the usbmisc driver.
Functionality is similar to i.MX53, so at this stage simply
reuse existing i.MX53 calls.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/usb/chipidea/usbmisc_imx.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 4381c5a6..cd061ab 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -204,6 +204,10 @@ static const struct of_device_id usbmisc_imx_dt_ids[] = {
.data = &imx27_usbmisc_ops,
},
{
+ .compatible = "fsl,imx51-usbmisc",
+ .data = &imx53_usbmisc_ops,
+ },
+ {
.compatible = "fsl,imx53-usbmisc",
.data = &imx53_usbmisc_ops,
},
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU
2013-11-26 15:36 ` [PATCH v2 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU Alexander Shiyan
@ 2013-11-28 2:28 ` Shawn Guo
2013-11-28 6:45 ` Alexander Shiyan
2013-11-29 8:51 ` Peter Chen
2013-12-04 13:59 ` Peter Chen
2 siblings, 1 reply; 9+ messages in thread
From: Shawn Guo @ 2013-11-28 2:28 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 26, 2013 at 07:36:50PM +0400, Alexander Shiyan wrote:
> This adds i.MX51 as the next user of the usbmisc driver.
> Functionality is similar to i.MX53, so at this stage simply
> reuse existing i.MX53 calls.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> drivers/usb/chipidea/usbmisc_imx.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
> index 4381c5a6..cd061ab 100644
> --- a/drivers/usb/chipidea/usbmisc_imx.c
> +++ b/drivers/usb/chipidea/usbmisc_imx.c
> @@ -204,6 +204,10 @@ static const struct of_device_id usbmisc_imx_dt_ids[] = {
> .data = &imx27_usbmisc_ops,
> },
> {
> + .compatible = "fsl,imx51-usbmisc",
> + .data = &imx53_usbmisc_ops,
If it simply uses imx53 ops, why do we need to introduce a new
compatible?
Shawn
> + },
> + {
> .compatible = "fsl,imx53-usbmisc",
> .data = &imx53_usbmisc_ops,
> },
> --
> 1.8.3.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU
2013-11-28 2:28 ` Shawn Guo
@ 2013-11-28 6:45 ` Alexander Shiyan
0 siblings, 0 replies; 9+ messages in thread
From: Alexander Shiyan @ 2013-11-28 6:45 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
> On Tue, Nov 26, 2013 at 07:36:50PM +0400, Alexander Shiyan wrote:
> > This adds i.MX51 as the next user of the usbmisc driver.
> > Functionality is similar to i.MX53, so at this stage simply
> > reuse existing i.MX53 calls.
> >
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> > ---
> > drivers/usb/chipidea/usbmisc_imx.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
> > index 4381c5a6..cd061ab 100644
> > --- a/drivers/usb/chipidea/usbmisc_imx.c
> > +++ b/drivers/usb/chipidea/usbmisc_imx.c
> > @@ -204,6 +204,10 @@ static const struct of_device_id usbmisc_imx_dt_ids[] = {
> > .data = &imx27_usbmisc_ops,
> > },
> > {
> > + .compatible = "fsl,imx51-usbmisc",
> > + .data = &imx53_usbmisc_ops,
>
> If it simply uses imx53 ops, why do we need to introduce a new
> compatible?
This has been discussed here:
http://www.spinics.net/lists/linux-usb/msg97502.html
Additionally, "fsl,imx51-usbmisc" string already present in imx51.dtsi.
Thanks.
---
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU
2013-11-26 15:36 ` [PATCH v2 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU Alexander Shiyan
2013-11-28 2:28 ` Shawn Guo
@ 2013-11-29 8:51 ` Peter Chen
2013-12-04 13:59 ` Peter Chen
2 siblings, 0 replies; 9+ messages in thread
From: Peter Chen @ 2013-11-29 8:51 UTC (permalink / raw)
To: linux-arm-kernel
> This adds i.MX51 as the next user of the usbmisc driver.
> Functionality is similar to i.MX53, so at this stage simply
> reuse existing i.MX53 calls.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> drivers/usb/chipidea/usbmisc_imx.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/usb/chipidea/usbmisc_imx.c
> b/drivers/usb/chipidea/usbmisc_imx.c
> index 4381c5a6..cd061ab 100644
> --- a/drivers/usb/chipidea/usbmisc_imx.c
> +++ b/drivers/usb/chipidea/usbmisc_imx.c
> @@ -204,6 +204,10 @@ static const struct of_device_id usbmisc_imx_dt_ids[]
> = {
> .data = &imx27_usbmisc_ops,
> },
> {
> + .compatible = "fsl,imx51-usbmisc",
> + .data = &imx53_usbmisc_ops,
> + },
> + {
> .compatible = "fsl,imx53-usbmisc",
> .data = &imx53_usbmisc_ops,
> },
> --
Acked-by: Peter Chen <peter.chen@freescale.com>
Peter
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU
2013-11-26 15:36 ` [PATCH v2 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU Alexander Shiyan
2013-11-28 2:28 ` Shawn Guo
2013-11-29 8:51 ` Peter Chen
@ 2013-12-04 13:59 ` Peter Chen
2 siblings, 0 replies; 9+ messages in thread
From: Peter Chen @ 2013-12-04 13:59 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 26, 2013 at 07:36:50PM +0400, Alexander Shiyan wrote:
> This adds i.MX51 as the next user of the usbmisc driver.
> Functionality is similar to i.MX53, so at this stage simply
> reuse existing i.MX53 calls.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> drivers/usb/chipidea/usbmisc_imx.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
> index 4381c5a6..cd061ab 100644
> --- a/drivers/usb/chipidea/usbmisc_imx.c
> +++ b/drivers/usb/chipidea/usbmisc_imx.c
> @@ -204,6 +204,10 @@ static const struct of_device_id usbmisc_imx_dt_ids[] = {
> .data = &imx27_usbmisc_ops,
> },
> {
> + .compatible = "fsl,imx51-usbmisc",
> + .data = &imx53_usbmisc_ops,
> + },
> + {
> .compatible = "fsl,imx53-usbmisc",
> .data = &imx53_usbmisc_ops,
> },
> --
> 1.8.3.2
>
>
Applied, thanks.
--
Best Regards,
Peter Chen
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 1/2] usb: chipidea: usbmisc: Add support for i.MX27/i.MX31 CPUs
2013-11-26 15:36 [PATCH v2 1/2] usb: chipidea: usbmisc: Add support for i.MX27/i.MX31 CPUs Alexander Shiyan
2013-11-26 15:36 ` [PATCH v2 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU Alexander Shiyan
@ 2013-11-29 8:46 ` Peter Chen
2013-11-30 5:19 ` Chris Ruehl
2013-12-04 13:58 ` Peter Chen
3 siblings, 0 replies; 9+ messages in thread
From: Peter Chen @ 2013-11-29 8:46 UTC (permalink / raw)
To: linux-arm-kernel
>
> This adds i.MX27 and i.MX31 as the next user of the usbmisc driver.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> drivers/usb/chipidea/usbmisc_imx.c | 42
> ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> diff --git a/drivers/usb/chipidea/usbmisc_imx.c
> b/drivers/usb/chipidea/usbmisc_imx.c
> index 8a1094b..4381c5a6 100644
> --- a/drivers/usb/chipidea/usbmisc_imx.c
> +++ b/drivers/usb/chipidea/usbmisc_imx.c
> @@ -21,6 +21,10 @@
> #define MX25_USB_PHY_CTRL_OFFSET 0x08
> #define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
>
> +#define MX27_H1_PM_BIT BIT(8)
> +#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
> @@ -68,6 +72,36 @@ static int usbmisc_imx25_post(struct imx_usbmisc_data
> *data)
> return 0;
> }
>
> +static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
> +{
> + unsigned long flags;
> + u32 val;
> +
> + switch (data->index) {
> + case 0:
> + val = MX27_OTG_PM_BIT;
> + break;
> + case 1:
> + val = MX27_H1_PM_BIT;
> + break;
> + case 2:
> + val = MX27_H2_PM_BIT;
> + break;
> + default:
> + return -EINVAL;
> + };
> +
> + spin_lock_irqsave(&usbmisc->lock, flags);
> + if (data->disable_oc)
> + val = readl(usbmisc->base) | val;
> + else
> + val = readl(usbmisc->base) & ~val;
> + writel(val, usbmisc->base);
> + spin_unlock_irqrestore(&usbmisc->lock, flags);
> +
> + return 0;
> +}
> +
> static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
> {
> void __iomem *reg = NULL;
> @@ -128,6 +162,10 @@ static const struct usbmisc_ops imx25_usbmisc_ops =
> {
> .post = usbmisc_imx25_post,
> };
>
> +static const struct usbmisc_ops imx27_usbmisc_ops = {
> + .init = usbmisc_imx27_init,
> +};
> +
> static const struct usbmisc_ops imx53_usbmisc_ops = {
> .init = usbmisc_imx53_init,
> };
> @@ -162,6 +200,10 @@ static const struct of_device_id usbmisc_imx_dt_ids[]
> = {
> .data = &imx25_usbmisc_ops,
> },
> {
> + .compatible = "fsl,imx27-usbmisc",
> + .data = &imx27_usbmisc_ops,
> + },
> + {
> .compatible = "fsl,imx53-usbmisc",
> .data = &imx53_usbmisc_ops,
> },
> --
Acked-by: Peter Chen <peter.chen@freescale.com>
Peter
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2 1/2] usb: chipidea: usbmisc: Add support for i.MX27/i.MX31 CPUs
2013-11-26 15:36 [PATCH v2 1/2] usb: chipidea: usbmisc: Add support for i.MX27/i.MX31 CPUs Alexander Shiyan
2013-11-26 15:36 ` [PATCH v2 2/2] usb: chipidea: usbmisc: Add support for i.MX51 CPU Alexander Shiyan
2013-11-29 8:46 ` [PATCH v2 1/2] usb: chipidea: usbmisc: Add support for i.MX27/i.MX31 CPUs Peter Chen
@ 2013-11-30 5:19 ` Chris Ruehl
2013-12-04 13:58 ` Peter Chen
3 siblings, 0 replies; 9+ messages in thread
From: Chris Ruehl @ 2013-11-30 5:19 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday, November 26, 2013 11:36 PM, Alexander Shiyan wrote:
> This adds i.MX27 and i.MX31 as the next user of the usbmisc driver.
>
> Signed-off-by: Alexander Shiyan<shc_work@mail.ru>
> ---
> drivers/usb/chipidea/usbmisc_imx.c | 42 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
> index 8a1094b..4381c5a6 100644
> --- a/drivers/usb/chipidea/usbmisc_imx.c
> +++ b/drivers/usb/chipidea/usbmisc_imx.c
> @@ -21,6 +21,10 @@
> #define MX25_USB_PHY_CTRL_OFFSET 0x08
> #define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
>
> +#define MX27_H1_PM_BIT BIT(8)
> +#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
> @@ -68,6 +72,36 @@ static int usbmisc_imx25_post(struct imx_usbmisc_data *data)
> return 0;
> }
>
> +static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
> +{
> + unsigned long flags;
> + u32 val;
> +
> + switch (data->index) {
> + case 0:
> + val = MX27_OTG_PM_BIT;
> + break;
> + case 1:
> + val = MX27_H1_PM_BIT;
> + break;
> + case 2:
> + val = MX27_H2_PM_BIT;
> + break;
> + default:
> + return -EINVAL;
> + };
> +
> + spin_lock_irqsave(&usbmisc->lock, flags);
> + if (data->disable_oc)
> + val = readl(usbmisc->base) | val;
> + else
> + val = readl(usbmisc->base)& ~val;
> + writel(val, usbmisc->base);
> + spin_unlock_irqrestore(&usbmisc->lock, flags);
> +
> + return 0;
> +}
> +
> static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
> {
> void __iomem *reg = NULL;
> @@ -128,6 +162,10 @@ static const struct usbmisc_ops imx25_usbmisc_ops = {
> .post = usbmisc_imx25_post,
> };
>
> +static const struct usbmisc_ops imx27_usbmisc_ops = {
> + .init = usbmisc_imx27_init,
> +};
> +
> static const struct usbmisc_ops imx53_usbmisc_ops = {
> .init = usbmisc_imx53_init,
> };
> @@ -162,6 +200,10 @@ static const struct of_device_id usbmisc_imx_dt_ids[] = {
> .data =&imx25_usbmisc_ops,
> },
> {
> + .compatible = "fsl,imx27-usbmisc",
> + .data =&imx27_usbmisc_ops,
> + },
> + {
> .compatible = "fsl,imx53-usbmisc",
> .data =&imx53_usbmisc_ops,
> },
Tested and works fine.
Acked-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
Regards
Chris
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2 1/2] usb: chipidea: usbmisc: Add support for i.MX27/i.MX31 CPUs
2013-11-26 15:36 [PATCH v2 1/2] usb: chipidea: usbmisc: Add support for i.MX27/i.MX31 CPUs Alexander Shiyan
` (2 preceding siblings ...)
2013-11-30 5:19 ` Chris Ruehl
@ 2013-12-04 13:58 ` Peter Chen
3 siblings, 0 replies; 9+ messages in thread
From: Peter Chen @ 2013-12-04 13:58 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 26, 2013 at 07:36:49PM +0400, Alexander Shiyan wrote:
> This adds i.MX27 and i.MX31 as the next user of the usbmisc driver.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> drivers/usb/chipidea/usbmisc_imx.c | 42 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
> index 8a1094b..4381c5a6 100644
> --- a/drivers/usb/chipidea/usbmisc_imx.c
> +++ b/drivers/usb/chipidea/usbmisc_imx.c
> @@ -21,6 +21,10 @@
> #define MX25_USB_PHY_CTRL_OFFSET 0x08
> #define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
>
> +#define MX27_H1_PM_BIT BIT(8)
> +#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
> @@ -68,6 +72,36 @@ static int usbmisc_imx25_post(struct imx_usbmisc_data *data)
> return 0;
> }
>
> +static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
> +{
> + unsigned long flags;
> + u32 val;
> +
> + switch (data->index) {
> + case 0:
> + val = MX27_OTG_PM_BIT;
> + break;
> + case 1:
> + val = MX27_H1_PM_BIT;
> + break;
> + case 2:
> + val = MX27_H2_PM_BIT;
> + break;
> + default:
> + return -EINVAL;
> + };
> +
> + spin_lock_irqsave(&usbmisc->lock, flags);
> + if (data->disable_oc)
> + val = readl(usbmisc->base) | val;
> + else
> + val = readl(usbmisc->base) & ~val;
> + writel(val, usbmisc->base);
> + spin_unlock_irqrestore(&usbmisc->lock, flags);
> +
> + return 0;
> +}
> +
> static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
> {
> void __iomem *reg = NULL;
> @@ -128,6 +162,10 @@ static const struct usbmisc_ops imx25_usbmisc_ops = {
> .post = usbmisc_imx25_post,
> };
>
> +static const struct usbmisc_ops imx27_usbmisc_ops = {
> + .init = usbmisc_imx27_init,
> +};
> +
> static const struct usbmisc_ops imx53_usbmisc_ops = {
> .init = usbmisc_imx53_init,
> };
> @@ -162,6 +200,10 @@ static const struct of_device_id usbmisc_imx_dt_ids[] = {
> .data = &imx25_usbmisc_ops,
> },
> {
> + .compatible = "fsl,imx27-usbmisc",
> + .data = &imx27_usbmisc_ops,
> + },
> + {
> .compatible = "fsl,imx53-usbmisc",
> .data = &imx53_usbmisc_ops,
> },
> --
> 1.8.3.2
>
>
Applied, thanks.
--
Best Regards,
Peter Chen
^ permalink raw reply [flat|nested] 9+ messages in thread