[PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[Ajay Kumar Gupta]

We can get dynamic FIFO information from CONFIGDATA register and
thus there is no need for any user defiend dyn_fifo.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/musb/musb_core.c |   19 ++++---------------
 include/linux/usb/musb.h     |    1 -
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 49f2346..2858940 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1404,21 +1404,10 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
 	musb->nr_endpoints = 1;
 	musb->epmask = 1;
 
-	if (reg & MUSB_CONFIGDATA_DYNFIFO) {
-		if (musb->config->dyn_fifo)
-			status = ep_config_from_table(musb);
-		else {
-			ERR("reconfigure software for Dynamic FIFOs\n");
-			status = -ENODEV;
-		}
-	} else {
-		if (!musb->config->dyn_fifo)
-			status = ep_config_from_hw(musb);
-		else {
-			ERR("reconfigure software for static FIFOs\n");
-			return -ENODEV;
-		}
-	}
+	if (reg & MUSB_CONFIGDATA_DYNFIFO)
+		status = ep_config_from_table(musb);
+	else
+		status = ep_config_from_hw(musb);
 
 	if (status < 0)
 		return status;
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index d437556..c5f006e 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -30,7 +30,6 @@ struct musb_hdrc_eps_bits {
 struct musb_hdrc_config {
 	/* MUSB configuration-specific details */
 	unsigned	multipoint:1;	/* multipoint device */
-	unsigned	dyn_fifo:1;	/* supports dynamic fifo sizing */
 	unsigned	soft_con:1;	/* soft connect required */
 	unsigned	utm_16:1;	/* utm data witdh is 16 bits */
 	unsigned	big_endian:1;	/* true if CPU uses big-endian */
-- 
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[Felipe Balbi]

Hi,

On Tue, Dec 15, 2009 at 02:31:46PM +0100, ext Ajay Kumar Gupta wrote:
>diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
>index d437556..c5f006e 100644
>--- a/include/linux/usb/musb.h
>+++ b/include/linux/usb/musb.h
>@@ -30,7 +30,6 @@ struct musb_hdrc_eps_bits {
> struct musb_hdrc_config {
> 	/* MUSB configuration-specific details */
> 	unsigned	multipoint:1;	/* multipoint device */
>-	unsigned	dyn_fifo:1;	/* supports dynamic fifo sizing */
> 	unsigned	soft_con:1;	/* soft connect required */
> 	unsigned	utm_16:1;	/* utm data witdh is 16 bits */
> 	unsigned	big_endian:1;	/* true if CPU uses big-endian */

same problem as the other patch I sent:

$ git grep -w dyn_fifo arch/
arch/arm/mach-davinci/usb.c:    .dyn_fifo       = true,
arch/arm/mach-omap2/usb-musb.c: .dyn_fifo       = 1,
arch/blackfin/mach-bf527/boards/cm_bf527.c:     .dyn_fifo       = 0,
arch/blackfin/mach-bf527/boards/ezbrd.c:        .dyn_fifo       = 0,
arch/blackfin/mach-bf527/boards/ezkit.c:        .dyn_fifo       = 0,
arch/blackfin/mach-bf548/boards/cm_bf548.c:     .dyn_fifo       = 0,
arch/blackfin/mach-bf548/boards/ezkit.c:        .dyn_fifo       = 0,

we have to agree who will carry the arch changes.

-- 
balbi

Re: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[Felipe Balbi]

On Tue, Dec 15, 2009 at 02:34:32PM +0100, Balbi Felipe (Nokia-D/Helsinki) wrote:
>Hi,
>
>On Tue, Dec 15, 2009 at 02:31:46PM +0100, ext Ajay Kumar Gupta wrote:
>>diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
>>index d437556..c5f006e 100644
>>--- a/include/linux/usb/musb.h
>>+++ b/include/linux/usb/musb.h
>>@@ -30,7 +30,6 @@ struct musb_hdrc_eps_bits {
>> struct musb_hdrc_config {
>> 	/* MUSB configuration-specific details */
>> 	unsigned	multipoint:1;	/* multipoint device */
>>-	unsigned	dyn_fifo:1;	/* supports dynamic fifo sizing */
>> 	unsigned	soft_con:1;	/* soft connect required */
>> 	unsigned	utm_16:1;	/* utm data witdh is 16 bits */
>> 	unsigned	big_endian:1;	/* true if CPU uses big-endian */
>
>same problem as the other patch I sent:
>
>$ git grep -w dyn_fifo arch/
>arch/arm/mach-davinci/usb.c:    .dyn_fifo       = true,
>arch/arm/mach-omap2/usb-musb.c: .dyn_fifo       = 1,
>arch/blackfin/mach-bf527/boards/cm_bf527.c:     .dyn_fifo       = 0,
>arch/blackfin/mach-bf527/boards/ezbrd.c:        .dyn_fifo       = 0,
>arch/blackfin/mach-bf527/boards/ezkit.c:        .dyn_fifo       = 0,
>arch/blackfin/mach-bf548/boards/cm_bf548.c:     .dyn_fifo       = 0,
>arch/blackfin/mach-bf548/boards/ezkit.c:        .dyn_fifo       = 0,
>
>we have to agree who will carry the arch changes.

what we can do is mark that field as deprecated and give one major 
release for people to remove that from their boards, then we send a 
patch finally removing it.

I'm talking about:

diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index d437556..c3ca147 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -30,7 +30,7 @@ struct musb_hdrc_eps_bits {
  struct musb_hdrc_config {
         /* MUSB configuration-specific details */
         unsigned        multipoint:1;   /* multipoint device */
-       unsigned        dyn_fifo:1;     /* supports dynamic fifo sizing */
+       unsigned        dyn_fifo:1 __deprecated;        /* supports dynamic fifo sizing */
         unsigned        soft_con:1;     /* soft connect required */
         unsigned        utm_16:1;       /* utm data witdh is 16 bits */
         unsigned        big_endian:1;   /* true if CPU uses big-endian */

how do you feel about that ?

-- 
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[Gupta, Ajay Kumar]

>Hi,
>
>On Tue, Dec 15, 2009 at 02:31:46PM +0100, ext Ajay Kumar Gupta wrote:
>>diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
>>index d437556..c5f006e 100644
>>--- a/include/linux/usb/musb.h
>>+++ b/include/linux/usb/musb.h
>>@@ -30,7 +30,6 @@ struct musb_hdrc_eps_bits {
>> struct musb_hdrc_config {
>>      /* MUSB configuration-specific details */
>>      unsigned        multipoint:1;   /* multipoint device */
>>-     unsigned        dyn_fifo:1;     /* supports dynamic fifo sizing */
>>      unsigned        soft_con:1;     /* soft connect required */
>>      unsigned        utm_16:1;       /* utm data witdh is 16 bits */
>>      unsigned        big_endian:1;   /* true if CPU uses big-endian */
>
>same problem as the other patch I sent:
>
>$ git grep -w dyn_fifo arch/
>arch/arm/mach-davinci/usb.c:    .dyn_fifo       = true,
>arch/arm/mach-omap2/usb-musb.c: .dyn_fifo       = 1,
>arch/blackfin/mach-bf527/boards/cm_bf527.c:     .dyn_fifo       = 0,
>arch/blackfin/mach-bf527/boards/ezbrd.c:        .dyn_fifo       = 0,
>arch/blackfin/mach-bf527/boards/ezkit.c:        .dyn_fifo       = 0,
>arch/blackfin/mach-bf548/boards/cm_bf548.c:     .dyn_fifo       = 0,
>arch/blackfin/mach-bf548/boards/ezkit.c:        .dyn_fifo       = 0,
>
>we have to agree who will carry the arch changes.

>what we can do is mark that field as deprecated and give one major
>release for people to remove that from their boards, then we send a
>patch finally removing it.

Even with one major release window someone has to submit patch removing them
from arch/ files. So I think it's better to remove them now itself. we can seperately
submit patches to respective maintainers. Or best is if Greg can accept those changes
which are mostly trivial.

-Ajay--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[Gupta, Ajay Kumar]

> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> owner@vger.kernel.org] On Behalf Of Gupta, Ajay Kumar
> Sent: Tuesday, December 15, 2009 8:45 PM
> To: felipe.balbi@nokia.com
> Cc: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org
> Subject: RE: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo
> 
> 
> >Hi,
> >
> >On Tue, Dec 15, 2009 at 02:31:46PM +0100, ext Ajay Kumar Gupta wrote:
> >>diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
> >>index d437556..c5f006e 100644
> >>--- a/include/linux/usb/musb.h
> >>+++ b/include/linux/usb/musb.h
> >>@@ -30,7 +30,6 @@ struct musb_hdrc_eps_bits {
> >> struct musb_hdrc_config {
> >>      /* MUSB configuration-specific details */
> >>      unsigned        multipoint:1;   /* multipoint device */
> >>-     unsigned        dyn_fifo:1;     /* supports dynamic fifo sizing */
> >>      unsigned        soft_con:1;     /* soft connect required */
> >>      unsigned        utm_16:1;       /* utm data witdh is 16 bits */
> >>      unsigned        big_endian:1;   /* true if CPU uses big-endian */
> >
> >same problem as the other patch I sent:
> >
> >$ git grep -w dyn_fifo arch/
> >arch/arm/mach-davinci/usb.c:    .dyn_fifo       = true,
> >arch/arm/mach-omap2/usb-musb.c: .dyn_fifo       = 1,
> >arch/blackfin/mach-bf527/boards/cm_bf527.c:     .dyn_fifo       = 0,
> >arch/blackfin/mach-bf527/boards/ezbrd.c:        .dyn_fifo       = 0,
> >arch/blackfin/mach-bf527/boards/ezkit.c:        .dyn_fifo       = 0,
> >arch/blackfin/mach-bf548/boards/cm_bf548.c:     .dyn_fifo       = 0,
> >arch/blackfin/mach-bf548/boards/ezkit.c:        .dyn_fifo       = 0,
> >
> >we have to agree who will carry the arch changes.
> 
> >what we can do is mark that field as deprecated and give one major
> >release for people to remove that from their boards, then we send a
> >patch finally removing it.
> 
> Even with one major release window someone has to submit patch removing
> them
> from arch/ files. So I think it's better to remove them now itself. we can
> seperately
> submit patches to respective maintainers. Or best is if Greg can accept
> those changes
> which are mostly trivial.

Felipe,

Any update on this ? Shall I send the series again with __deprecated ? or
If you can just add it on your own?

Thanks,
Ajay

> 
> -Ajay--
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[Felipe Balbi]

Hi,

On Thu, Dec 17, 2009 at 02:01:27PM +0100, ext Gupta, Ajay Kumar wrote:
>Any update on this ? Shall I send the series again with __deprecated ? or
>If you can just add it on your own?

I guess we have to do that and start sending patches to arch maintainers 
removing the dyn_fifo stuff from board-files.

we should have all fixed by the end of .33-final, then we send a patch 
finally removing dyn_fifo from musb's platform_data.

-- 
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[Gupta, Ajay Kumar]

> -----Original Message-----
> From: Felipe Balbi [mailto:felipe.balbi@nokia.com]
> Sent: Thursday, December 17, 2009 6:40 PM
> To: Gupta, Ajay Kumar
> Cc: Balbi Felipe (Nokia-D/Helsinki); linux-usb@vger.kernel.org; linux-
> omap@vger.kernel.org
> Subject: Re: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo
> 
> Hi,
> 
> On Thu, Dec 17, 2009 at 02:01:27PM +0100, ext Gupta, Ajay Kumar wrote:
> >Any update on this ? Shall I send the series again with __deprecated ? or
> >If you can just add it on your own?
> 
> I guess we have to do that and start sending patches to arch maintainers
> removing the dyn_fifo stuff from board-files.
> 
> we should have all fixed by the end of .33-final, then we send a patch
> finally removing dyn_fifo from musb's platform_data.

Ok fine, then please drop that specific patch from series and pick the
Others.

-Ajay
> 
> --
> balbi

Re: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[Felipe Balbi]

Hi,

On Thu, Dec 17, 2009 at 02:12:58PM +0100, ext Gupta, Ajay Kumar wrote:
>Ok fine, then please drop that specific patch from series and pick the
>Others.

will do :-)

-- 
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/4] musb: save dynfifo in musb struct

[Ajay Kumar Gupta]

Save dynamic FIFO read only information for later uses during
musb_save/restore_context functions.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/musb/musb_core.c |    4 +++-
 drivers/usb/musb/musb_core.h |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 2858940..9d3b97d 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1328,8 +1328,10 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
 	reg = musb_read_configdata(mbase);
 
 	strcpy(aInfo, (reg & MUSB_CONFIGDATA_UTMIDW) ? "UTMI-16" : "UTMI-8");
-	if (reg & MUSB_CONFIGDATA_DYNFIFO)
+	if (reg & MUSB_CONFIGDATA_DYNFIFO) {
 		strcat(aInfo, ", dyn FIFOs");
+		musb->dyn_fifo = true;
+	}
 	if (reg & MUSB_CONFIGDATA_MPRXE) {
 		strcat(aInfo, ", bulk combine");
 #ifdef C_MP_RX
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 03d5090..969287c 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -411,6 +411,7 @@ struct musb {
 
 	unsigned		hb_iso_rx:1;	/* high bandwidth iso rx? */
 	unsigned		hb_iso_tx:1;	/* high bandwidth iso tx? */
+	unsigned		dyn_fifo:1;	/* dynamic FIFO supported? */
 
 #ifdef C_MP_TX
 	unsigned bulk_split:1;
-- 
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/4 v4] musb: Add context save and restore support

[Ajay Kumar Gupta]

Adding support for MUSB register save and restore during system
suspend and resume.

Changes:
        - Added musb_save/restore_context() functions
        - Added platform specific musb_platform_save/restore_context()
          to handle platform specific jobs.
        - Maintaining BlackFin compatibility by adding read/write
          functions for registers which are not available in BlackFin

Tested system suspend and resume on OMAP3EVM board.

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
---
Changes from v3:
	- Removed force disconnect in gadget mode.
 drivers/usb/musb/musb_core.c |  146 ++++++++++++++++++++++++++++++++++++++++++
 drivers/usb/musb/musb_core.h |   39 +++++++++++
 drivers/usb/musb/musb_regs.h |   90 ++++++++++++++++++++++++++
 drivers/usb/musb/omap2430.c  |   16 +++++
 4 files changed, 291 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 9d3b97d..39ce125 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2156,6 +2156,148 @@ static int __devexit musb_remove(struct platform_device *pdev)
 
 #ifdef	CONFIG_PM
 
+static struct musb_context_registers musb_context;
+
+void musb_save_context(struct musb *musb)
+{
+	int i;
+	void __iomem *musb_base = musb->mregs;
+
+	if (is_host_enabled(musb)) {
+		musb_context.frame = musb_readw(musb_base, MUSB_FRAME);
+		musb_context.testmode = musb_readb(musb_base, MUSB_TESTMODE);
+	}
+	musb_context.power = musb_readb(musb_base, MUSB_POWER);
+	musb_context.intrtxe = musb_readw(musb_base, MUSB_INTRTXE);
+	musb_context.intrrxe = musb_readw(musb_base, MUSB_INTRRXE);
+	musb_context.intrusbe = musb_readb(musb_base, MUSB_INTRUSBE);
+	musb_context.index = musb_readb(musb_base, MUSB_INDEX);
+	musb_context.devctl = musb_readb(musb_base, MUSB_DEVCTL);
+
+	for (i = 0; i < MUSB_C_NUM_EPS; ++i) {
+		musb_writeb(musb_base, MUSB_INDEX, i);
+		musb_context.index_regs[i].txmaxp =
+			musb_readw(musb_base, 0x10 + MUSB_TXMAXP);
+		musb_context.index_regs[i].txcsr =
+			musb_readw(musb_base, 0x10 + MUSB_TXCSR);
+		musb_context.index_regs[i].rxmaxp =
+			musb_readw(musb_base, 0x10 + MUSB_RXMAXP);
+		musb_context.index_regs[i].rxcsr =
+			musb_readw(musb_base, 0x10 + MUSB_RXCSR);
+
+		if (musb->dyn_fifo) {
+			musb_context.index_regs[i].txfifoadd =
+					musb_read_txfifoadd(musb_base);
+			musb_context.index_regs[i].rxfifoadd =
+					musb_read_rxfifoadd(musb_base);
+			musb_context.index_regs[i].txfifosz =
+					musb_read_txfifosz(musb_base);
+			musb_context.index_regs[i].rxfifosz =
+					musb_read_rxfifosz(musb_base);
+		}
+		if (is_host_enabled(musb)) {
+			musb_context.index_regs[i].txtype =
+				musb_readb(musb_base, 0x10 + MUSB_TXTYPE);
+			musb_context.index_regs[i].txinterval =
+				musb_readb(musb_base, 0x10 + MUSB_TXINTERVAL);
+			musb_context.index_regs[i].rxtype =
+				musb_readb(musb_base, 0x10 + MUSB_RXTYPE);
+			musb_context.index_regs[i].rxinterval =
+				musb_readb(musb_base, 0x10 + MUSB_RXINTERVAL);
+
+			musb_context.index_regs[i].txfunaddr =
+				musb_read_txfunaddr(musb_base, i);
+			musb_context.index_regs[i].txhubaddr =
+				musb_read_txhubaddr(musb_base, i);
+			musb_context.index_regs[i].txhubport =
+				musb_read_txhubport(musb_base, i);
+
+			musb_context.index_regs[i].rxfunaddr =
+				musb_read_rxfunaddr(musb_base, i);
+			musb_context.index_regs[i].rxhubaddr =
+				musb_read_rxhubaddr(musb_base, i);
+			musb_context.index_regs[i].rxhubport =
+				musb_read_rxhubport(musb_base, i);
+		}
+	}
+
+	musb_writeb(musb_base, MUSB_INDEX, musb_context.index);
+
+	musb_platform_save_context(&musb_context);
+}
+
+void musb_restore_context(struct musb *musb)
+{
+	int i;
+	void __iomem *musb_base = musb->mregs;
+	void __iomem *ep_target_regs;
+
+	musb_platform_restore_context(&musb_context);
+
+	if (is_host_enabled(musb)) {
+		musb_writew(musb_base, MUSB_FRAME, musb_context.frame);
+		musb_writeb(musb_base, MUSB_TESTMODE, musb_context.testmode);
+	}
+	musb_writeb(musb_base, MUSB_POWER, musb_context.power);
+	musb_writew(musb_base, MUSB_INTRTXE, musb_context.intrtxe);
+	musb_writew(musb_base, MUSB_INTRRXE, musb_context.intrrxe);
+	musb_writeb(musb_base, MUSB_INTRUSBE, musb_context.intrusbe);
+	musb_writeb(musb_base, MUSB_DEVCTL, musb_context.devctl);
+
+	for (i = 0; i < MUSB_C_NUM_EPS; ++i) {
+		musb_writeb(musb_base, MUSB_INDEX, i);
+		musb_writew(musb_base, 0x10 + MUSB_TXMAXP,
+			musb_context.index_regs[i].txmaxp);
+		musb_writew(musb_base, 0x10 + MUSB_TXCSR,
+			musb_context.index_regs[i].txcsr);
+		musb_writew(musb_base, 0x10 + MUSB_RXMAXP,
+			musb_context.index_regs[i].rxmaxp);
+		musb_writew(musb_base, 0x10 + MUSB_RXCSR,
+			musb_context.index_regs[i].rxcsr);
+
+		if (musb->dyn_fifo) {
+			musb_write_txfifosz(musb_base,
+				musb_context.index_regs[i].txfifosz);
+			musb_write_rxfifosz(musb_base,
+				musb_context.index_regs[i].rxfifosz);
+			musb_write_txfifoadd(musb_base,
+				musb_context.index_regs[i].txfifoadd);
+			musb_write_rxfifoadd(musb_base,
+				musb_context.index_regs[i].rxfifoadd);
+		}
+
+		if (is_host_enabled(musb)) {
+			musb_writeb(musb_base, 0x10 + MUSB_TXTYPE,
+				musb_context.index_regs[i].txtype);
+			musb_writeb(musb_base, 0x10 + MUSB_TXINTERVAL,
+				musb_context.index_regs[i].txinterval);
+			musb_writeb(musb_base, 0x10 + MUSB_RXTYPE,
+				musb_context.index_regs[i].rxtype);
+			musb_writeb(musb_base, 0x10 + MUSB_RXINTERVAL,
+
+			musb_context.index_regs[i].rxinterval);
+			musb_write_txfunaddr(musb_base, i,
+				musb_context.index_regs[i].txfunaddr);
+			musb_write_txhubaddr(musb_base, i,
+				musb_context.index_regs[i].txhubaddr);
+			musb_write_txhubport(musb_base, i,
+				musb_context.index_regs[i].txhubport);
+
+			ep_target_regs =
+				musb_read_target_reg_base(i, musb_base);
+
+			musb_write_rxfunaddr(ep_target_regs,
+				musb_context.index_regs[i].rxfunaddr);
+			musb_write_rxhubaddr(ep_target_regs,
+				musb_context.index_regs[i].rxhubaddr);
+			musb_write_rxhubport(ep_target_regs,
+				musb_context.index_regs[i].rxhubport);
+		}
+	}
+
+	musb_writeb(musb_base, MUSB_INDEX, musb_context.index);
+}
+
 static int musb_suspend(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
@@ -2177,6 +2319,8 @@ static int musb_suspend(struct device *dev)
 		 */
 	}
 
+	musb_save_context(musb);
+
 	if (musb->set_clock)
 		musb->set_clock(musb->clock, 0);
 	else
@@ -2198,6 +2342,8 @@ static int musb_resume_noirq(struct device *dev)
 	else
 		clk_enable(musb->clock);
 
+	musb_restore_context(musb);
+
 	/* for static cmos like DaVinci, register values were preserved
 	 * unless for some reason the whole soc powered down or the USB
 	 * module got reset through the PSC (vs just being disabled).
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 969287c..38de1be 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -462,6 +462,45 @@ struct musb {
 #endif
 };
 
+#ifdef CONFIG_PM
+struct musb_csr_regs {
+	/* FIFO registers */
+	u16 txmaxp, txcsr, rxmaxp, rxcsr;
+	u16 rxfifoadd, txfifoadd;
+	u8 txtype, txinterval, rxtype, rxinterval;
+	u8 rxfifosz, txfifosz;
+	u8 txfunaddr, txhubaddr, txhubport;
+	u8 rxfunaddr, rxhubaddr, rxhubport;
+};
+
+struct musb_context_registers {
+
+#if defined(CONFIG_ARCH_OMAP34XX)
+	u32 otg_sysconfig, otg_forcestandby;
+#endif
+	u8 power;
+	u16 intrtxe, intrrxe;
+	u8 intrusbe;
+	u16 frame;
+	u8 index, testmode;
+
+	u8 devctl, misc;
+
+	struct musb_csr_regs index_regs[MUSB_C_NUM_EPS];
+};
+
+#if defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP2430)
+extern void musb_platform_save_context(struct musb_context_registers
+		*musb_context);
+extern void musb_platform_restore_context(struct musb_context_registers
+		*musb_context);
+#else
+#define musb_platform_save_context(x)		do {} while (0)
+#define musb_platform_restore_context(x)	do {} while (0)
+#endif
+
+#endif
+
 static inline void musb_set_vbus(struct musb *musb, int is_on)
 {
 	musb->board_set_vbus(musb, is_on);
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index 473a94e..8ca8f23 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -321,6 +321,26 @@ static inline void  musb_write_rxfifoadd(void __iomem *mbase, u16 c_off)
 	musb_writew(mbase, MUSB_RXFIFOADD, c_off);
 }
 
+static inline u8 musb_read_txfifosz(void __iomem *mbase)
+{
+	return musb_readb(mbase, MUSB_TXFIFOSZ);
+}
+
+static inline u16 musb_read_txfifoadd(void __iomem *mbase)
+{
+	return musb_readw(mbase, MUSB_TXFIFOADD);
+}
+
+static inline u8 musb_read_rxfifosz(void __iomem *mbase)
+{
+	return musb_readb(mbase, MUSB_RXFIFOSZ);
+}
+
+static inline u16  musb_read_rxfifoadd(void __iomem *mbase)
+{
+	return musb_readw(mbase, MUSB_RXFIFOADD);
+}
+
 static inline u8 musb_read_configdata(void __iomem *mbase)
 {
 	musb_writeb(mbase, MUSB_INDEX, 0);
@@ -376,6 +396,36 @@ static inline void  musb_write_txhubport(void __iomem *mbase, u8 epnum,
 			qh_h_port_reg);
 }
 
+static inline u8 musb_read_rxfunaddr(void __iomem *mbase, u8 epnum)
+{
+	return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_RXFUNCADDR));
+}
+
+static inline u8 musb_read_rxhubaddr(void __iomem *mbase, u8 epnum)
+{
+	return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_RXHUBADDR));
+}
+
+static inline u8 musb_read_rxhubport(void __iomem *mbase, u8 epnum)
+{
+	return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_RXHUBPORT));
+}
+
+static inline u8  musb_read_txfunaddr(void __iomem *mbase, u8 epnum)
+{
+	return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_TXFUNCADDR));
+}
+
+static inline u8  musb_read_txhubaddr(void __iomem *mbase, u8 epnum)
+{
+	return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_TXHUBADDR));
+}
+
+static inline u8  musb_read_txhubport(void __iomem *mbase, u8 epnum)
+{
+	return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_TXHUBPORT));
+}
+
 #else /* CONFIG_BLACKFIN */
 
 #define USB_BASE		USB_FADDR
@@ -455,6 +505,22 @@ static inline void  musb_write_rxfifoadd(void __iomem *mbase, u16 c_off)
 {
 }
 
+static inline u8 musb_read_txfifosz(void __iomem *mbase)
+{
+}
+
+static inline u16 musb_read_txfifoadd(void __iomem *mbase)
+{
+}
+
+static inline u8 musb_read_rxfifosz(void __iomem *mbase)
+{
+}
+
+static inline u16  musb_read_rxfifoadd(void __iomem *mbase)
+{
+}
+
 static inline u8 musb_read_configdata(void __iomem *mbase)
 {
 	return 0;
@@ -500,6 +566,30 @@ static inline void  musb_write_txhubport(void __iomem *mbase, u8 epnum,
 {
 }
 
+static inline u8 musb_read_rxfunaddr(void __iomem *mbase, u8 epnum)
+{
+}
+
+static inline u8 musb_read_rxhubaddr(void __iomem *mbase, u8 epnum)
+{
+}
+
+static inline u8 musb_read_rxhubport(void __iomem *mbase, u8 epnum)
+{
+}
+
+static inline u8  musb_read_txfunaddr(void __iomem *mbase, u8 epnum)
+{
+}
+
+static inline u8  musb_read_txhubaddr(void __iomem *mbase, u8 epnum)
+{
+}
+
+static inline void  musb_read_txhubport(void __iomem *mbase, u8 epnum)
+{
+}
+
 #endif /* CONFIG_BLACKFIN */
 
 #endif	/* __MUSB_REGS_H__ */
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 83beeac..15a3f27 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -255,6 +255,22 @@ int __init musb_platform_init(struct musb *musb)
 	return 0;
 }
 
+#ifdef CONFIG_PM
+void musb_platform_save_context(struct musb_context_registers
+		*musb_context)
+{
+	musb_context->otg_sysconfig = omap_readl(OTG_SYSCONFIG);
+	musb_context->otg_forcestandby = omap_readl(OTG_FORCESTDBY);
+}
+
+void musb_platform_restore_context(struct musb_context_registers
+		*musb_context)
+{
+	omap_writel(musb_context->otg_sysconfig, OTG_SYSCONFIG);
+	omap_writel(musb_context->otg_forcestandby, OTG_FORCESTDBY);
+}
+#endif
+
 int musb_platform_suspend(struct musb *musb)
 {
 	u32 l;
-- 
1.6.2.4

[PATCH 4/4] musb: Add 'extvbus' in musb_hdrc_platform_data

[Ajay Kumar Gupta]

Some of the board might use external Vbus power supply on musb
interface which would require to program ULPI_BUSCONTROL register.

Adding 'extvbus' flag which can be set from such boards which will
be checked at musb driver files before programming ULPI_BUSCONTROL.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
---
Appended MUSB_ before bot definitions.

 drivers/usb/musb/musb_core.c |    8 ++++++++
 drivers/usb/musb/musb_regs.h |    5 +++++
 include/linux/usb/musb.h     |    3 +++
 3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 39ce125..479468e 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2016,6 +2016,7 @@ bad_config:
 	/* host side needs more setup */
 	if (is_host_enabled(musb)) {
 		struct usb_hcd	*hcd = musb_to_hcd(musb);
+		u8 busctl;
 
 		otg_set_host(musb->xceiv, &hcd->self);
 
@@ -2023,6 +2024,13 @@ bad_config:
 			hcd->self.otg_port = 1;
 		musb->xceiv->host = &hcd->self;
 		hcd->power_budget = 2 * (plat->power ? : 250);
+
+		/* program PHY to use external vBus if required */
+		if (plat->extvbus) {
+			busctl = musb_readb(musb->mregs, MUSB_ULPI_BUSCONTROL);
+			busctl |= MUSB_ULPI_USE_EXTVBUS;
+			musb_writeb(musb->mregs, MUSB_ULPI_BUSCONTROL, busctl);
+		}
 	}
 
 	/* For the host-only role, we can activate right away.
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index 8ca8f23..895fb05 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -72,6 +72,10 @@
 #define MUSB_DEVCTL_HR		0x02
 #define MUSB_DEVCTL_SESSION	0x01
 
+/* MUSB ULPI VBUSCONTROL */
+#define MUSB_ULPI_USE_EXTVBUS	0x01
+#define MUSB_ULPI_USE_EXTVBUSIND 0x02
+
 /* TESTMODE */
 #define MUSB_TEST_FORCE_HOST	0x80
 #define MUSB_TEST_FIFO_ACCESS	0x40
@@ -246,6 +250,7 @@
 
 /* REVISIT: vctrl/vstatus: optional vendor utmi+phy register at 0x68 */
 #define MUSB_HWVERS		0x6C	/* 8 bit */
+#define MUSB_ULPI_BUSCONTROL	0x70	/* 8 bit */
 
 #define MUSB_EPINFO		0x78	/* 8 bit */
 #define MUSB_RAMINFO		0x79	/* 8 bit */
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index c5f006e..d77d532 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -75,6 +75,9 @@ struct musb_hdrc_platform_data {
 	/* (HOST or OTG) msec/2 after VBUS on till power good */
 	u8		potpgt;
 
+	/* (HOST or OTG) program PHY for external Vbus */
+	unsigned	extvbus:1;
+
 	/* Power the device on or off */
 	int		(*set_power)(int state);
 
-- 
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 4/4] musb: Add 'extvbus' in musb_hdrc_platform_data

[Felipe Balbi]

On Tue, Dec 15, 2009 at 02:31:49PM +0100, ext Ajay Kumar Gupta wrote:
>Some of the board might use external Vbus power supply on musb
>interface which would require to program ULPI_BUSCONTROL register.
>
>Adding 'extvbus' flag which can be set from such boards which will
>be checked at musb driver files before programming ULPI_BUSCONTROL.
>
>Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>

applied, thanks

-- 
balbi

Re: [PATCH 3/4 v4] musb: Add context save and restore support

[Felipe Balbi]

On Tue, Dec 15, 2009 at 02:31:48PM +0100, ext Ajay Kumar Gupta wrote:
>Adding support for MUSB register save and restore during system
>suspend and resume.
>
>Changes:
>        - Added musb_save/restore_context() functions
>        - Added platform specific musb_platform_save/restore_context()
>          to handle platform specific jobs.
>        - Maintaining BlackFin compatibility by adding read/write
>          functions for registers which are not available in BlackFin
>
>Tested system suspend and resume on OMAP3EVM board.
>
>Signed-off-by: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
>Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>

applied, thanks

-- 
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/4 v4] musb: Add context save and restore support

[Felipe Balbi]

On Tue, Dec 15, 2009 at 02:31:48PM +0100, ext Ajay Kumar Gupta wrote:
>Adding support for MUSB register save and restore during system
>suspend and resume.
>
>Changes:
>        - Added musb_save/restore_context() functions
>        - Added platform specific musb_platform_save/restore_context()
>          to handle platform specific jobs.
>        - Maintaining BlackFin compatibility by adding read/write
>          functions for registers which are not available in BlackFin
>
>Tested system suspend and resume on OMAP3EVM board.
>
>Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
>Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>

for this, I'm waiting you and Arnaud to agree on what you both need.

-- 
balbi

Re: [PATCH 2/4] musb: save dynfifo in musb struct

[Felipe Balbi]

On Tue, Dec 15, 2009 at 02:31:47PM +0100, ext Ajay Kumar Gupta wrote:
>Save dynamic FIFO read only information for later uses during
>musb_save/restore_context functions.
>
>Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>

applied thanks.

-- 
balbi

Re: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[Tony Lindgren]

* Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org> [091215 05:31]:
> We can get dynamic FIFO information from CONFIGDATA register and
> thus there is no need for any user defiend dyn_fifo.

Have you tested this?

$ grep dyn_fifo arch/arm/mach-omap2/*.c
arch/arm/mach-omap2/usb-musb.c: .dyn_fifo       = 1,

Tony
 
> Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
> ---
>  drivers/usb/musb/musb_core.c |   19 ++++---------------
>  include/linux/usb/musb.h     |    1 -
>  2 files changed, 4 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
> index 49f2346..2858940 100644
> --- a/drivers/usb/musb/musb_core.c
> +++ b/drivers/usb/musb/musb_core.c
> @@ -1404,21 +1404,10 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
>  	musb->nr_endpoints = 1;
>  	musb->epmask = 1;
>  
> -	if (reg & MUSB_CONFIGDATA_DYNFIFO) {
> -		if (musb->config->dyn_fifo)
> -			status = ep_config_from_table(musb);
> -		else {
> -			ERR("reconfigure software for Dynamic FIFOs\n");
> -			status = -ENODEV;
> -		}
> -	} else {
> -		if (!musb->config->dyn_fifo)
> -			status = ep_config_from_hw(musb);
> -		else {
> -			ERR("reconfigure software for static FIFOs\n");
> -			return -ENODEV;
> -		}
> -	}
> +	if (reg & MUSB_CONFIGDATA_DYNFIFO)
> +		status = ep_config_from_table(musb);
> +	else
> +		status = ep_config_from_hw(musb);
>  
>  	if (status < 0)
>  		return status;
> diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
> index d437556..c5f006e 100644
> --- a/include/linux/usb/musb.h
> +++ b/include/linux/usb/musb.h
> @@ -30,7 +30,6 @@ struct musb_hdrc_eps_bits {
>  struct musb_hdrc_config {
>  	/* MUSB configuration-specific details */
>  	unsigned	multipoint:1;	/* multipoint device */
> -	unsigned	dyn_fifo:1;	/* supports dynamic fifo sizing */
>  	unsigned	soft_con:1;	/* soft connect required */
>  	unsigned	utm_16:1;	/* utm data witdh is 16 bits */
>  	unsigned	big_endian:1;	/* true if CPU uses big-endian */
> -- 
> 1.6.2.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo

[Gupta, Ajay Kumar]

> -----Original Message-----
> From: Tony Lindgren [mailto:tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org]
> Sent: Tuesday, December 15, 2009 11:10 PM
> To: Gupta, Ajay Kumar
> Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org;
> felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org
> Subject: Re: [PATCH 1/4] musb: get rid of unneeded musb->config->dyn_fifo
> 
> * Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org> [091215 05:31]:
> > We can get dynamic FIFO information from CONFIGDATA register and
> > thus there is no need for any user defiend dyn_fifo.
> 
> Have you tested this?
> 
> $ grep dyn_fifo arch/arm/mach-omap2/*.c
> arch/arm/mach-omap2/usb-musb.c: .dyn_fifo       = 1,

I did test but with this arch specific compilation fixes. 

We are still waiting a response from Greg if he will accept these arch specific changes with USB patch set.

-Ajay
> 
> Tony
> 
> > Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
> > ---
> >  drivers/usb/musb/musb_core.c |   19 ++++---------------
> >  include/linux/usb/musb.h     |    1 -
> >  2 files changed, 4 insertions(+), 16 deletions(-)
> >
> > diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
> > index 49f2346..2858940 100644
> > --- a/drivers/usb/musb/musb_core.c
> > +++ b/drivers/usb/musb/musb_core.c
> > @@ -1404,21 +1404,10 @@ static int __init musb_core_init(u16 musb_type,
> struct musb *musb)
> >  	musb->nr_endpoints = 1;
> >  	musb->epmask = 1;
> >
> > -	if (reg & MUSB_CONFIGDATA_DYNFIFO) {
> > -		if (musb->config->dyn_fifo)
> > -			status = ep_config_from_table(musb);
> > -		else {
> > -			ERR("reconfigure software for Dynamic FIFOs\n");
> > -			status = -ENODEV;
> > -		}
> > -	} else {
> > -		if (!musb->config->dyn_fifo)
> > -			status = ep_config_from_hw(musb);
> > -		else {
> > -			ERR("reconfigure software for static FIFOs\n");
> > -			return -ENODEV;
> > -		}
> > -	}
> > +	if (reg & MUSB_CONFIGDATA_DYNFIFO)
> > +		status = ep_config_from_table(musb);
> > +	else
> > +		status = ep_config_from_hw(musb);
> >
> >  	if (status < 0)
> >  		return status;
> > diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
> > index d437556..c5f006e 100644
> > --- a/include/linux/usb/musb.h
> > +++ b/include/linux/usb/musb.h
> > @@ -30,7 +30,6 @@ struct musb_hdrc_eps_bits {
> >  struct musb_hdrc_config {
> >  	/* MUSB configuration-specific details */
> >  	unsigned	multipoint:1;	/* multipoint device */
> > -	unsigned	dyn_fifo:1;	/* supports dynamic fifo sizing */
> >  	unsigned	soft_con:1;	/* soft connect required */
> >  	unsigned	utm_16:1;	/* utm data witdh is 16 bits */
> >  	unsigned	big_endian:1;	/* true if CPU uses big-endian */
> > --
> > 1.6.2.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html