[PATCH v3 2/2] ARM : OMAP4 : MUSB : Add USB support to 4430 SDP board file

[PATCH v3 2/2] ARM : OMAP4 : MUSB : Add USB support to 4430 SDP board file

[Maulik Mankad]

ARM : OMAP4 : Add USB support to 4430 SDP board file

This patch adds support for Mentor USB to 4430 SDP board
file.

It also defines the base address for HS USB OTG controller
in OMAP4.

Also updates platform specfic structure with base address
and IRQ details.

Signed-off-by: Maulik Mankad <x0082077-l0cyMroinI0@public.gmane.org>
Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
Cc: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
Cc: David Brownell <david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org>
Cc: Greg Kroah-Hartman <gregkh-l3A5Bk7waGM@public.gmane.org>
Cc: Sergei Shtylyov <sshtylyov-hkdhdckH98+B+jHODAdFcQ@public.gmane.org>
Cc: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
---
 arch/arm/mach-omap2/board-4430sdp.c        |   10 ++++++++++
 arch/arm/mach-omap2/usb-musb.c             |    9 +++++++--
 arch/arm/plat-omap/include/plat/omap44xx.h |    1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

Index: felipe_musb/arch/arm/mach-omap2/board-4430sdp.c
===================================================================
--- felipe_musb.orig/arch/arm/mach-omap2/board-4430sdp.c
+++ felipe_musb/arch/arm/mach-omap2/board-4430sdp.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
+#include <linux/usb/otg.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -27,6 +28,7 @@
 #include <plat/common.h>
 #include <plat/control.h>
 #include <plat/timer-gp.h>
+#include <plat/usb.h>
 #include <asm/hardware/gic.h>
 
 static struct platform_device sdp4430_lcd_device = {
@@ -73,11 +75,19 @@ static void __init omap_4430sdp_init_irq
 	omap_gpio_init();
 }
 
+static struct omap_musb_board_data musb_board_data = {
+	.interface_type		= MUSB_INTERFACE_UTMI,
+	.mode			= MUSB_PERIPHERAL,
+	.power			= 100,
+};
 
 static void __init omap_4430sdp_init(void)
 {
 	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));
 	omap_serial_init();
+	/* OMAP4 SDP uses internal transceiver so register nop transceiver */
+	usb_nop_xceiv_register();
+	usb_musb_init(&musb_board_data);
 }
 
 static void __init omap_4430sdp_map_io(void)
Index: felipe_musb/arch/arm/mach-omap2/usb-musb.c
===================================================================
--- felipe_musb.orig/arch/arm/mach-omap2/usb-musb.c
+++ felipe_musb/arch/arm/mach-omap2/usb-musb.c
@@ -77,10 +77,15 @@ static struct platform_device musb_devic
 
 void __init usb_musb_init(struct omap_musb_board_data *board_data)
 {
-	if (cpu_is_omap243x())
+	if (cpu_is_omap243x()) {
 		musb_resources[0].start = OMAP243X_HS_BASE;
-	else
+	} else if (cpu_is_omap34xx()) {
 		musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
+	} else if (cpu_is_omap44xx()) {
+		musb_resources[0].start = OMAP44XX_HSUSB_OTG_BASE;
+		musb_resources[1].start = INT_44XX_HS_USB_MC;
+		musb_resources[2].start = INT_44XX_HS_USB_DMA;
+	}
 	musb_resources[0].end = musb_resources[0].start + SZ_4K - 1;
 
 	/*
Index: felipe_musb/arch/arm/plat-omap/include/plat/omap44xx.h
===================================================================
--- felipe_musb.orig/arch/arm/plat-omap/include/plat/omap44xx.h
+++ felipe_musb/arch/arm/plat-omap/include/plat/omap44xx.h
@@ -43,6 +43,7 @@
 #define OMAP44XX_WKUPGEN_BASE		0x48281000
 
 #define OMAP44XX_MAILBOX_BASE		(L4_44XX_BASE + 0xF4000)
+#define OMAP44XX_HSUSB_OTG_BASE		(L4_44XX_BASE + 0xAB000)
 
 #endif /* __ASM_ARCH_OMAP44XX_H */
 
--
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 v3 2/2] ARM : OMAP4 : MUSB : Add USB support to 4430 SDP board file

[Felipe Balbi]

On Thu, Dec 31, 2009 at 02:23:02PM +0100, ext Maulik Mankad wrote:
>ARM : OMAP4 : Add USB support to 4430 SDP board file
>
>This patch adds support for Mentor USB to 4430 SDP board
>file.
>
>It also defines the base address for HS USB OTG controller
>in OMAP4.
>
>Also updates platform specfic structure with base address
>and IRQ details.
>
>Signed-off-by: Maulik Mankad <x0082077@ti.com>
>Cc: Tony Lindgren <tony@atomide.com>
>Cc: Felipe Balbi <felipe.balbi@nokia.com>
>Cc: David Brownell <david-b@pacbell.net>
>Cc: Greg Kroah-Hartman <gregkh@suse.de>
>Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
>Cc: Olof Johansson <olof@lixom.net>

I'm ok with this patch, want to hear from Tony.

Tony do you have any comment for this patch ? Will you take it or should 
Greg take it ? I believe it's better to come through your tree.

-- 
balbi

Re: [PATCH v3 2/2] ARM : OMAP4 : MUSB : Add USB support to 4430 SDP board file

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [100128 11:46]:
> On Thu, Dec 31, 2009 at 02:23:02PM +0100, ext Maulik Mankad wrote:
> >ARM : OMAP4 : Add USB support to 4430 SDP board file
> >
> >This patch adds support for Mentor USB to 4430 SDP board
> >file.
> >
> >It also defines the base address for HS USB OTG controller
> >in OMAP4.
> >
> >Also updates platform specfic structure with base address
> >and IRQ details.
> >
> >Signed-off-by: Maulik Mankad <x0082077@ti.com>
> >Cc: Tony Lindgren <tony@atomide.com>
> >Cc: Felipe Balbi <felipe.balbi@nokia.com>
> >Cc: David Brownell <david-b@pacbell.net>
> >Cc: Greg Kroah-Hartman <gregkh@suse.de>
> >Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> >Cc: Olof Johansson <olof@lixom.net>
> 
> I'm ok with this patch, want to hear from Tony.

Looks good to me.
 
> Tony do you have any comment for this patch ? Will you take it or
> should Greg take it ? I believe it's better to come through your
> tree.

I can take them if you prefer that. If you want me to queue this
stuff, can you please pile all the arch/arm/*omap*/ USB patches
into a git branch for me against 2.6.33-rc6?

Regards,

Tony

RE: [PATCH v3 2/2] ARM : OMAP4 : MUSB : Add USB support to 4430 SDP board file

[Maulik]

>>From: Tony Lindgren [mailto:tony@atomide.com] 
>>Sent: Tuesday, February 02, 2010 3:47 AM
>>To: Felipe Balbi
>>Cc: ext Maulik Mankad; linux-omap@vger.kernel.org;
linux->>usb@vger.kernel.org; David Brownell; Greg Kroah-Hartman; Sergei
Shtylyov; >>Olof Johansson
>>Subject: Re: [PATCH v3 2/2] ARM : OMAP4 : MUSB : Add USB support to 4430
>>SDP board file


>>I can take them if you prefer that. If you want me to queue this
>>stuff, can you please pile all the arch/arm/*omap*/ USB patches
>>into a git branch for me against 2.6.33-rc6?

Okay, will send out the rebased patches soon.

Thanks,
Maulik

Re: [PATCH v3 2/2] ARM : OMAP4 : MUSB : Add USB support to 4430 SDP board file

[Tony Lindgren]

* Maulik <x0082077@ti.com> [100202 03:15]:
> >>From: Tony Lindgren [mailto:tony@atomide.com] 
> >>Sent: Tuesday, February 02, 2010 3:47 AM
> >>To: Felipe Balbi
> >>Cc: ext Maulik Mankad; linux-omap@vger.kernel.org;
> linux->>usb@vger.kernel.org; David Brownell; Greg Kroah-Hartman; Sergei
> Shtylyov; >>Olof Johansson
> >>Subject: Re: [PATCH v3 2/2] ARM : OMAP4 : MUSB : Add USB support to 4430
> >>SDP board file
> 
> 
> >>I can take them if you prefer that. If you want me to queue this
> >>stuff, can you please pile all the arch/arm/*omap*/ USB patches
> >>into a git branch for me against 2.6.33-rc6?
> 
> Okay, will send out the rebased patches soon.

Thanks, yeah I guess Felipe is on vacation in February.

Regards,

Tony