[PATCH 1/3] am335xevm: Add support for musb interface

[PATCH 1/3] am335xevm: Add support for musb interface

[Ajay Kumar Gupta]

Adding musb support in am335x EVM board file.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
---
These three patches are dependent on my patch set on musb support
for ti81xx recently at [1] and am33xx base port patches from
Vaibhav Hiremath at [2].

[1] http://marc.info/?l=linux-omap&m=131557610318645&w=2
[2] http://marc.info/?l=linux-omap&m=131652916305543&w=2

musb interface on am33xx is exactly same as ti81xx platform and so uses
same glue driver as is.

 arch/arm/mach-omap2/board-am335xevm.c |    9 +++++++++
 arch/arm/mach-omap2/usb-musb.c        |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
index a4102ef..298dc51 100644
--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
@@ -24,6 +24,14 @@
 #include <plat/irqs.h>
 #include <plat/board.h>
 #include <plat/common.h>
+#include <plat/usb.h>
+
+static struct omap_musb_board_data musb_board_data = {
+	.set_phy_power	= ti81xx_musb_phy_power,
+	.interface_type	= MUSB_INTERFACE_ULPI,
+	.mode           = MUSB_OTG,
+	.power		= 500,
+};
 
 #include "mux.h"
 
@@ -73,6 +81,7 @@ static void __init am335x_evm_init(void)
 	omap_sdrc_init(NULL, NULL);
 	omap_board_config = am335x_evm_config;
 	omap_board_config_size = ARRAY_SIZE(am335x_evm_config);
+	usb_musb_init(&musb_board_data);
 }
 
 static void __init am335x_evm_map_io(void)
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 4ad8e0e..cfc1443 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -143,7 +143,7 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
 	if (cpu_is_omap3517() || cpu_is_omap3505()) {
 		oh_name = "am35x_otg_hs";
 		name = "musb-am35x";
-	} else if (cpu_is_ti81xx()) {
+	} else if (cpu_is_ti81xx() || cpu_is_am335x()) {
 		musb_config.multipoint = 0;
 		oh_name = "usb_otg_hs";
 		name = "musb-ti81xx";
-- 
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 2/3] arm: omap: am335x: enable phy controls

[Ajay Kumar Gupta]

Switch on the phy for am335x.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
---
 arch/arm/mach-omap2/omap_phy_internal.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c
index d5e8497..ce616a1 100644
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -269,16 +269,19 @@ void ti81xx_musb_phy_power(u8 on)
 		if (cpu_is_ti816x()) {
 			usbphycfg |= TI816X_USBPHY0_NORMAL_MODE;
 			usbphycfg &= ~TI816X_USBPHY_REFCLK_OSC;
-		} else if (cpu_is_ti814x()) {
-			usbphycfg &= ~(USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN
-				| USBPHY_DPINPUT | USBPHY_DMINPUT);
-			usbphycfg |= (USBPHY_OTGVDET_EN | USBPHY_OTGSESSEND_EN
-				| USBPHY_DPOPBUFCTL | USBPHY_DMOPBUFCTL);
+		} else if (cpu_is_ti814x() || cpu_is_am335x()) {
+			usbphycfg &= ~(USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN);
+			usbphycfg |= USBPHY_OTGVDET_EN | USBPHY_OTGSESSEND_EN;
+			if (cpu_is_ti814x()) {
+				usbphycfg &= ~(USBPHY_DPINPUT | USBPHY_DMINPUT);
+				usbphycfg |= USBPHY_DPOPBUFCTL
+					| USBPHY_DMOPBUFCTL;
+			}
 		}
 	} else {
 		if (cpu_is_ti816x())
 			usbphycfg &= ~TI816X_USBPHY0_NORMAL_MODE;
-		else if (cpu_is_ti814x())
+		else if (cpu_is_ti814x() || cpu_is_am335x())
 			usbphycfg |= USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN;
 
 	}
-- 
1.6.2.4

[PATCH 3/3] usb: musb: enable support for am335x

[Ajay Kumar Gupta]

Enabled the flag so that musb_dsps glue file can be used for am335x

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

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index d6abdec..4e21aee 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -8,7 +8,7 @@ config USB_MUSB_HDRC
 	depends on USB && USB_GADGET
 	depends on (ARM || (BF54x && !BF544) || (BF52x && !BF522 && !BF523))
 	select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)
-	select NOP_USB_XCEIV if SOC_OMAPTI81XX
+	select NOP_USB_XCEIV if (SOC_OMAPTI81XX || SOC_OMAPAM33XX)
 	select TWL4030_USB if MACH_OMAP_3430SDP
 	select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
 	select USB_OTG_UTILS
@@ -57,7 +57,7 @@ config USB_MUSB_AM35X
 
 config USB_MUSB_DSPS
 	tristate "TI DSPS platforms"
-	depends on SOC_OMAPTI81XX
+	depends on (SOC_OMAPTI81XX || SOC_OMAPAM33XX)
 
 config USB_MUSB_BLACKFIN
 	tristate "Blackfin"
@@ -73,7 +73,7 @@ config MUSB_PIO_ONLY
 	bool 'Disable DMA (always use PIO)'
 	depends on USB_MUSB_HDRC
 	default USB_MUSB_TUSB6010 || USB_MUSB_DA8XX || USB_MUSB_AM35X
-	default SOC_OMAPTI81XX
+	default SOC_OMAPTI81XX || SOC_OMAPAM33XX
 	help
 	  All data is copied between memory and FIFO by the CPU.
 	  DMA controllers are ignored.
-- 
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 3/3] usb: musb: enable support for am335x

[Sergei Shtylyov]

Hello.

On 26-09-2011 14:03, Ajay Kumar Gupta wrote:

> Enabled the flag so that musb_dsps glue file can be used for am335x

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

> diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
> index d6abdec..4e21aee 100644
> --- a/drivers/usb/musb/Kconfig
> +++ b/drivers/usb/musb/Kconfig
> @@ -8,7 +8,7 @@ config USB_MUSB_HDRC
>   	depends on USB&&  USB_GADGET
>   	depends on (ARM || (BF54x&&  !BF544) || (BF52x&&  !BF522&&  !BF523))
>   	select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)
> -	select NOP_USB_XCEIV if SOC_OMAPTI81XX
> +	select NOP_USB_XCEIV if (SOC_OMAPTI81XX || SOC_OMAPAM33XX)
>   	select TWL4030_USB if MACH_OMAP_3430SDP
>   	select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
>   	select USB_OTG_UTILS
> @@ -57,7 +57,7 @@ config USB_MUSB_AM35X
>
>   config USB_MUSB_DSPS
>   	tristate "TI DSPS platforms"
> -	depends on SOC_OMAPTI81XX
> +	depends on (SOC_OMAPTI81XX || SOC_OMAPAM33XX)

    Parens not needed here and above.

WBR, Sergei
--
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/3] am335xevm: Add support for musb interface

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

Hi,

On Mon, Sep 26, 2011 at 03:33:11PM +0530, Ajay Kumar Gupta wrote:
> Adding musb support in am335x EVM board file.
> 
> Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>

should go through OMAP tree:

Acked-by: Felipe Balbi <balbi@ti.com>

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: [PATCH 2/3] arm: omap: am335x: enable phy controls

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

Hi,

On Mon, Sep 26, 2011 at 03:33:12PM +0530, Ajay Kumar Gupta wrote:
> Switch on the phy for am335x.
> 
> Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>

should go through OMAP tree:

Acked-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: [PATCH 3/3] usb: musb: enable support for am335x

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]

Hi,

On Mon, Sep 26, 2011 at 02:47:11PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 26-09-2011 14:03, Ajay Kumar Gupta wrote:
> 
> >Enabled the flag so that musb_dsps glue file can be used for am335x
> 
> >Signed-off-by: Ajay Kumar Gupta<ajay.gupta-l0cyMroinI0@public.gmane.org>
> >---
> >  drivers/usb/musb/Kconfig |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> >diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
> >index d6abdec..4e21aee 100644
> >--- a/drivers/usb/musb/Kconfig
> >+++ b/drivers/usb/musb/Kconfig
> >@@ -8,7 +8,7 @@ config USB_MUSB_HDRC
> >  	depends on USB&&  USB_GADGET
> >  	depends on (ARM || (BF54x&&  !BF544) || (BF52x&&  !BF522&&  !BF523))
> >  	select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)
> >-	select NOP_USB_XCEIV if SOC_OMAPTI81XX
> >+	select NOP_USB_XCEIV if (SOC_OMAPTI81XX || SOC_OMAPAM33XX)
> >  	select TWL4030_USB if MACH_OMAP_3430SDP
> >  	select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
> >  	select USB_OTG_UTILS
> >@@ -57,7 +57,7 @@ config USB_MUSB_AM35X
> >
> >  config USB_MUSB_DSPS
> >  	tristate "TI DSPS platforms"
> >-	depends on SOC_OMAPTI81XX
> >+	depends on (SOC_OMAPTI81XX || SOC_OMAPAM33XX)
> 
>    Parens not needed here and above.

are we getting a revised version ?

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

RE: [PATCH 3/3] usb: musb: enable support for am335x

[Gupta, Ajay Kumar]

Hi,
> On Mon, Sep 26, 2011 at 02:47:11PM +0400, Sergei Shtylyov wrote:
> > Hello.
> >
> > On 26-09-2011 14:03, Ajay Kumar Gupta wrote:
> >
> > >Enabled the flag so that musb_dsps glue file can be used for am335x
> >
> > >Signed-off-by: Ajay Kumar Gupta<ajay.gupta@ti.com>
> > >---
> > >  drivers/usb/musb/Kconfig |    6 +++---
> > >  1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > >diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
> > >index d6abdec..4e21aee 100644
> > >--- a/drivers/usb/musb/Kconfig
> > >+++ b/drivers/usb/musb/Kconfig
> > >@@ -8,7 +8,7 @@ config USB_MUSB_HDRC
> > >  	depends on USB&&  USB_GADGET
> > >  	depends on (ARM || (BF54x&&  !BF544) || (BF52x&&  !BF522&&
> !BF523))
> > >  	select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM ||
> BLACKFIN)
> > >-	select NOP_USB_XCEIV if SOC_OMAPTI81XX
> > >+	select NOP_USB_XCEIV if (SOC_OMAPTI81XX || SOC_OMAPAM33XX)
> > >  	select TWL4030_USB if MACH_OMAP_3430SDP
> > >  	select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
> > >  	select USB_OTG_UTILS
> > >@@ -57,7 +57,7 @@ config USB_MUSB_AM35X
> > >
> > >  config USB_MUSB_DSPS
> > >  	tristate "TI DSPS platforms"
> > >-	depends on SOC_OMAPTI81XX
> > >+	depends on (SOC_OMAPTI81XX || SOC_OMAPAM33XX)
> >
> >    Parens not needed here and above.
> 
> are we getting a revised version ?

Yes, I will send the revised version with earlier set fixing your
comment.

Thanks,
Ajay
> 
> --
> balbi

Re: [PATCH 3/3] usb: musb: enable support for am335x

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1667 bytes --]

On Mon, Oct 10, 2011 at 10:35:15AM +0530, Gupta, Ajay Kumar wrote:
> Hi,
> > On Mon, Sep 26, 2011 at 02:47:11PM +0400, Sergei Shtylyov wrote:
> > > Hello.
> > >
> > > On 26-09-2011 14:03, Ajay Kumar Gupta wrote:
> > >
> > > >Enabled the flag so that musb_dsps glue file can be used for am335x
> > >
> > > >Signed-off-by: Ajay Kumar Gupta<ajay.gupta-l0cyMroinI0@public.gmane.org>
> > > >---
> > > >  drivers/usb/musb/Kconfig |    6 +++---
> > > >  1 files changed, 3 insertions(+), 3 deletions(-)
> > >
> > > >diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
> > > >index d6abdec..4e21aee 100644
> > > >--- a/drivers/usb/musb/Kconfig
> > > >+++ b/drivers/usb/musb/Kconfig
> > > >@@ -8,7 +8,7 @@ config USB_MUSB_HDRC
> > > >  	depends on USB&&  USB_GADGET
> > > >  	depends on (ARM || (BF54x&&  !BF544) || (BF52x&&  !BF522&&
> > !BF523))
> > > >  	select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM ||
> > BLACKFIN)
> > > >-	select NOP_USB_XCEIV if SOC_OMAPTI81XX
> > > >+	select NOP_USB_XCEIV if (SOC_OMAPTI81XX || SOC_OMAPAM33XX)
> > > >  	select TWL4030_USB if MACH_OMAP_3430SDP
> > > >  	select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
> > > >  	select USB_OTG_UTILS
> > > >@@ -57,7 +57,7 @@ config USB_MUSB_AM35X
> > > >
> > > >  config USB_MUSB_DSPS
> > > >  	tristate "TI DSPS platforms"
> > > >-	depends on SOC_OMAPTI81XX
> > > >+	depends on (SOC_OMAPTI81XX || SOC_OMAPAM33XX)
> > >
> > >    Parens not needed here and above.
> > 
> > are we getting a revised version ?
> 
> Yes, I will send the revised version with earlier set fixing your
> comment.

sounds great, tks

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]