* [PATCH 01/11] USB: Add empty functions in otg.h
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-19 23:30 ` [PATCH 02/11] omap: musb: Remove #ifdef from board-omap3evm.c Tony Lindgren
` (10 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Maulik Mankad <x0082077@ti.com>
Add empty functions for usb_nop_xceiv_register()
and usb_nop_xceiv_unregister() in otg.h so that
these functions can be called even when
CONFIG_NOP_USB_XCEIV is not enabled.
It allows to remove ifdef's from board file.
Signed-off-by: Maulik Mankad <x0082077@ti.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Ajay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
include/linux/usb/otg.h | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index 52bb917..fef0972 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -110,9 +110,19 @@ struct otg_transceiver {
/* for board-specific init logic */
extern int otg_set_transceiver(struct otg_transceiver *);
+#if defined(CONFIG_NOP_USB_XCEIV) || defined(CONFIG_NOP_USB_XCEIV_MODULE)
/* sometimes transceivers are accessed only through e.g. ULPI */
extern void usb_nop_xceiv_register(void);
extern void usb_nop_xceiv_unregister(void);
+#else
+static inline void usb_nop_xceiv_register(void)
+{
+}
+
+static inline void usb_nop_xceiv_unregister(void)
+{
+}
+#endif
/* helpers for direct access thru low-level io interface */
static inline int otg_io_read(struct otg_transceiver *otg, u32 reg)
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 02/11] omap: musb: Remove #ifdef from board-omap3evm.c
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
2010-02-19 23:30 ` [PATCH 01/11] USB: Add empty functions in otg.h Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-19 23:30 ` [PATCH 03/11] arm: omap: musb: ioremap only what's ours Tony Lindgren
` (9 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Maulik Mankad <x0082077@ti.com>
This patch removes #ifdef around usb_nop_xceiv_register()
from board-omap3evm.c
Signed-off-by: Maulik Mankad <x0082077@ti.com>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-omap3evm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index fa1f9d5..57506da 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -675,10 +675,10 @@ static void __init omap3_evm_init(void)
ARRAY_SIZE(omap3evm_spi_board_info));
omap_serial_init();
-#ifdef CONFIG_NOP_USB_XCEIV
+
/* OMAP3EVM uses ISP1504 phy and so register nop transceiver */
usb_nop_xceiv_register();
-#endif
+
if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) {
/* enable EHCI VBUS using GPIO22 */
omap_mux_init_gpio(22, OMAP_PIN_INPUT_PULLUP);
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 03/11] arm: omap: musb: ioremap only what's ours
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
2010-02-19 23:30 ` [PATCH 01/11] USB: Add empty functions in otg.h Tony Lindgren
2010-02-19 23:30 ` [PATCH 02/11] omap: musb: Remove #ifdef from board-omap3evm.c Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-19 23:37 ` Aguirre, Sergio
2010-02-19 23:30 ` [PATCH 04/11] omap: musb: Pass board specific data from board file Tony Lindgren
` (8 subsequent siblings)
11 siblings, 1 reply; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Felipe Balbi <felipe.balbi@nokia.com>
omap3430 TRM says the OTG address space is 4k, not 8k.
Cc: linux-usb at vger.kernel.org
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/usb-musb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index a80441d..ba71f76 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -152,7 +152,7 @@ void __init usb_musb_init(void)
musb_resources[0].start = OMAP243X_HS_BASE;
else
musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
- musb_resources[0].end = musb_resources[0].start + SZ_8K - 1;
+ musb_resources[0].end = musb_resources[0].start + SZ_4K - 1;
/*
* REVISIT: This line can be removed once all the platforms using
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 03/11] arm: omap: musb: ioremap only what's ours
2010-02-19 23:30 ` [PATCH 03/11] arm: omap: musb: ioremap only what's ours Tony Lindgren
@ 2010-02-19 23:37 ` Aguirre, Sergio
2010-02-19 23:44 ` Tony Lindgren
0 siblings, 1 reply; 22+ messages in thread
From: Aguirre, Sergio @ 2010-02-19 23:37 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> owner at vger.kernel.org] On Behalf Of Tony Lindgren
> Sent: Friday, February 19, 2010 5:30 PM
> To: linux-arm-kernel at lists.infradead.org
> Cc: Felipe Balbi; linux-omap at vger.kernel.org; linux-usb at vger.kernel.org
> Subject: [PATCH 03/11] arm: omap: musb: ioremap only what's ours
>
> From: Felipe Balbi <felipe.balbi@nokia.com>
>
> omap3430 TRM says the OTG address space is 4k, not 8k.
>
> Cc: linux-usb at vger.kernel.org
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
> arch/arm/mach-omap2/usb-musb.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-
> musb.c
> index a80441d..ba71f76 100644
> --- a/arch/arm/mach-omap2/usb-musb.c
> +++ b/arch/arm/mach-omap2/usb-musb.c
> @@ -152,7 +152,7 @@ void __init usb_musb_init(void)
> musb_resources[0].start = OMAP243X_HS_BASE;
> else
> musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
> - musb_resources[0].end = musb_resources[0].start + SZ_8K - 1;
> + musb_resources[0].end = musb_resources[0].start + SZ_4K - 1;
I'm just curious...
Is this valid also if cpu_is_243x() ?
Regards,
Sergio
>
> /*
> * REVISIT: This line can be removed once all the platforms using
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 03/11] arm: omap: musb: ioremap only what's ours
2010-02-19 23:37 ` Aguirre, Sergio
@ 2010-02-19 23:44 ` Tony Lindgren
2010-02-19 23:55 ` Aguirre, Sergio
0 siblings, 1 reply; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:44 UTC (permalink / raw)
To: linux-arm-kernel
* Aguirre, Sergio <saaguirre@ti.com> [100219 15:34]:
> Hi,
>
> > -----Original Message-----
> > From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> > owner at vger.kernel.org] On Behalf Of Tony Lindgren
> > Sent: Friday, February 19, 2010 5:30 PM
> > To: linux-arm-kernel at lists.infradead.org
> > Cc: Felipe Balbi; linux-omap at vger.kernel.org; linux-usb at vger.kernel.org
> > Subject: [PATCH 03/11] arm: omap: musb: ioremap only what's ours
> >
> > From: Felipe Balbi <felipe.balbi@nokia.com>
> >
> > omap3430 TRM says the OTG address space is 4k, not 8k.
> >
> > Cc: linux-usb at vger.kernel.org
> > Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > ---
> > arch/arm/mach-omap2/usb-musb.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-
> > musb.c
> > index a80441d..ba71f76 100644
> > --- a/arch/arm/mach-omap2/usb-musb.c
> > +++ b/arch/arm/mach-omap2/usb-musb.c
> > @@ -152,7 +152,7 @@ void __init usb_musb_init(void)
> > musb_resources[0].start = OMAP243X_HS_BASE;
> > else
> > musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
> > - musb_resources[0].end = musb_resources[0].start + SZ_8K - 1;
> > + musb_resources[0].end = musb_resources[0].start + SZ_4K - 1;
>
> I'm just curious...
>
> Is this valid also if cpu_is_243x() ?
Yes, the other 4K is for the L4 interconnect.
Tony
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 03/11] arm: omap: musb: ioremap only what's ours
2010-02-19 23:44 ` Tony Lindgren
@ 2010-02-19 23:55 ` Aguirre, Sergio
2010-02-20 0:10 ` Tony Lindgren
0 siblings, 1 reply; 22+ messages in thread
From: Aguirre, Sergio @ 2010-02-19 23:55 UTC (permalink / raw)
To: linux-arm-kernel
Hi Tony,
> -----Original Message-----
> From: Tony Lindgren [mailto:tony at atomide.com]
> Sent: Friday, February 19, 2010 5:44 PM
> To: Aguirre, Sergio
> Cc: linux-arm-kernel at lists.infradead.org; Felipe Balbi; linux-
> omap at vger.kernel.org; linux-usb at vger.kernel.org
> Subject: Re: [PATCH 03/11] arm: omap: musb: ioremap only what's ours
>
> * Aguirre, Sergio <saaguirre@ti.com> [100219 15:34]:
> > Hi,
> >
> > > -----Original Message-----
> > > From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> > > owner at vger.kernel.org] On Behalf Of Tony Lindgren
> > > Sent: Friday, February 19, 2010 5:30 PM
> > > To: linux-arm-kernel at lists.infradead.org
> > > Cc: Felipe Balbi; linux-omap at vger.kernel.org; linux-
> usb at vger.kernel.org
> > > Subject: [PATCH 03/11] arm: omap: musb: ioremap only what's ours
> > >
> > > From: Felipe Balbi <felipe.balbi@nokia.com>
> > >
> > > omap3430 TRM says the OTG address space is 4k, not 8k.
> > >
> > > Cc: linux-usb at vger.kernel.org
> > > Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> > > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > > ---
> > > arch/arm/mach-omap2/usb-musb.c | 2 +-
> > > 1 files changed, 1 insertions(+), 1 deletions(-)
> > >
> > > diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-
> > > musb.c
> > > index a80441d..ba71f76 100644
> > > --- a/arch/arm/mach-omap2/usb-musb.c
> > > +++ b/arch/arm/mach-omap2/usb-musb.c
> > > @@ -152,7 +152,7 @@ void __init usb_musb_init(void)
> > > musb_resources[0].start = OMAP243X_HS_BASE;
> > > else
> > > musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
> > > - musb_resources[0].end = musb_resources[0].start + SZ_8K - 1;
> > > + musb_resources[0].end = musb_resources[0].start + SZ_4K - 1;
> >
> > I'm just curious...
> >
> > Is this valid also if cpu_is_243x() ?
>
> Yes, the other 4K is for the L4 interconnect.
Ok...
But then in this case, shouldn't these register boundaries come from a platform specific header file?
That would be cleaner, I believe, and easier to maintain in the long run.
What do you think?
Regards,
Sergio
>
> Tony
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 03/11] arm: omap: musb: ioremap only what's ours
2010-02-19 23:55 ` Aguirre, Sergio
@ 2010-02-20 0:10 ` Tony Lindgren
0 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-20 0:10 UTC (permalink / raw)
To: linux-arm-kernel
* Aguirre, Sergio <saaguirre@ti.com> [100219 15:52]:
> Hi Tony,
>
> > -----Original Message-----
> > From: Tony Lindgren [mailto:tony at atomide.com]
> > Sent: Friday, February 19, 2010 5:44 PM
> > To: Aguirre, Sergio
> > Cc: linux-arm-kernel at lists.infradead.org; Felipe Balbi; linux-
> > omap at vger.kernel.org; linux-usb at vger.kernel.org
> > Subject: Re: [PATCH 03/11] arm: omap: musb: ioremap only what's ours
> >
> > * Aguirre, Sergio <saaguirre@ti.com> [100219 15:34]:
> > > Hi,
> > >
> > > > -----Original Message-----
> > > > From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> > > > owner at vger.kernel.org] On Behalf Of Tony Lindgren
> > > > Sent: Friday, February 19, 2010 5:30 PM
> > > > To: linux-arm-kernel at lists.infradead.org
> > > > Cc: Felipe Balbi; linux-omap at vger.kernel.org; linux-
> > usb at vger.kernel.org
> > > > Subject: [PATCH 03/11] arm: omap: musb: ioremap only what's ours
> > > >
> > > > From: Felipe Balbi <felipe.balbi@nokia.com>
> > > >
> > > > omap3430 TRM says the OTG address space is 4k, not 8k.
> > > >
> > > > Cc: linux-usb at vger.kernel.org
> > > > Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> > > > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > > > ---
> > > > arch/arm/mach-omap2/usb-musb.c | 2 +-
> > > > 1 files changed, 1 insertions(+), 1 deletions(-)
> > > >
> > > > diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-
> > > > musb.c
> > > > index a80441d..ba71f76 100644
> > > > --- a/arch/arm/mach-omap2/usb-musb.c
> > > > +++ b/arch/arm/mach-omap2/usb-musb.c
> > > > @@ -152,7 +152,7 @@ void __init usb_musb_init(void)
> > > > musb_resources[0].start = OMAP243X_HS_BASE;
> > > > else
> > > > musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
> > > > - musb_resources[0].end = musb_resources[0].start + SZ_8K - 1;
> > > > + musb_resources[0].end = musb_resources[0].start + SZ_4K - 1;
> > >
> > > I'm just curious...
> > >
> > > Is this valid also if cpu_is_243x() ?
> >
> > Yes, the other 4K is for the L4 interconnect.
>
> Ok...
>
> But then in this case, shouldn't these register boundaries come from a platform specific header file?
>
> That would be cleaner, I believe, and easier to maintain in the long run.
>
> What do you think?
Yeah that will eventually get sorted out by hwmod.
Tony
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 04/11] omap: musb: Pass board specific data from board file
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
` (2 preceding siblings ...)
2010-02-19 23:30 ` [PATCH 03/11] arm: omap: musb: ioremap only what's ours Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-19 23:30 ` [PATCH 05/11] omap: musb: remove unused data Tony Lindgren
` (7 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Maulik Mankad <x0082077@ti.com>
Pass board specific data for MUSB (like interface_type,
mode etc) from board file by defining board
specific structure.
Each board file can define this structure based on
its requirement and pass this information to the
driver.
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: Gupta Ajay Kumar <ajay.gupta@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-2430sdp.c | 8 +++++++-
arch/arm/mach-omap2/board-3430sdp.c | 8 +++++++-
arch/arm/mach-omap2/board-cm-t35.c | 8 +++++++-
arch/arm/mach-omap2/board-devkit8000.c | 8 +++++++-
arch/arm/mach-omap2/board-igep0020.c | 8 +++++++-
arch/arm/mach-omap2/board-ldp.c | 8 +++++++-
arch/arm/mach-omap2/board-omap3beagle.c | 8 +++++++-
arch/arm/mach-omap2/board-omap3evm.c | 8 +++++++-
arch/arm/mach-omap2/board-omap3pandora.c | 8 +++++++-
arch/arm/mach-omap2/board-omap3touchbook.c | 8 +++++++-
arch/arm/mach-omap2/board-overo.c | 8 +++++++-
arch/arm/mach-omap2/board-rx51.c | 8 +++++++-
arch/arm/mach-omap2/board-zoom-peripherals.c | 8 +++++++-
arch/arm/mach-omap2/usb-musb.c | 7 +++++--
arch/arm/plat-omap/include/plat/usb.h | 11 ++++++++++-
include/linux/usb/musb.h | 3 +++
16 files changed, 109 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index d6f55ef..01d113f 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -193,6 +193,12 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
{} /* Terminator */
};
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static void __init omap_2430sdp_init(void)
{
int ret;
@@ -202,7 +208,7 @@ static void __init omap_2430sdp_init(void)
platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));
omap_serial_init();
omap2_hsmmc_init(mmc);
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
board_smc91x_init();
/* Turn off secondary LCD backlight */
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 5adef51..a10e96f 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -760,6 +760,12 @@ static struct flash_partitions sdp_flash_partitions[] = {
},
};
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static void __init omap_3430sdp_init(void)
{
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
@@ -774,7 +780,7 @@ static void __init omap_3430sdp_init(void)
ARRAY_SIZE(sdp3430_spi_board_info));
ads7846_dev_init();
omap_serial_init();
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
board_smc91x_init();
sdp_flash_init(sdp_flash_partitions);
sdp3430_display_init();
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 8659c3e..afa77ca 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -811,6 +811,12 @@ static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static void __init cm_t35_init(void)
{
omap3_mux_init(board_mux, OMAP_PACKAGE_CUS);
@@ -822,7 +828,7 @@ static void __init cm_t35_init(void)
cm_t35_init_led();
cm_t35_init_display();
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
}
MACHINE_START(CM_T35, "Compulab CM-T35")
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 89a55f1..3710190 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -630,6 +630,12 @@ static void __init devkit8000_flash_init(void)
}
}
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
@@ -665,7 +671,7 @@ static void __init devkit8000_init(void)
/* REVISIT leave DVI powered down until it's needed ... */
gpio_direction_output(170, true);
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
usb_ehci_init(&ehci_pdata);
devkit8000_flash_init();
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 748f418..9958987 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -436,6 +436,12 @@ static int __init igep2_i2c_init(void)
return 0;
}
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
.port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
@@ -461,7 +467,7 @@ static void __init igep2_init(void)
igep2_i2c_init();
platform_add_devices(igep2_devices, ARRAY_SIZE(igep2_devices));
omap_serial_init();
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
usb_ehci_init(&ehci_pdata);
igep2_flash_init();
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index 095adcb..5fcb52e 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -383,6 +383,12 @@ static struct omap_board_mux board_mux[] __initdata = {
#define board_mux NULL
#endif
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static void __init omap_ldp_init(void)
{
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
@@ -394,7 +400,7 @@ static void __init omap_ldp_init(void)
ARRAY_SIZE(ldp_spi_board_info));
ads7846_dev_init();
omap_serial_init();
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
omap2_hsmmc_init(mmc);
/* link regulators to MMC adapters */
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 1bae699..6eb77e1 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -430,6 +430,12 @@ static struct omap_board_mux board_mux[] __initdata = {
#define board_mux NULL
#endif
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static void __init omap3_beagle_init(void)
{
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
@@ -443,7 +449,7 @@ static void __init omap3_beagle_init(void)
/* REVISIT leave DVI powered down until it's needed ... */
gpio_direction_output(170, true);
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
usb_ehci_init(&ehci_pdata);
omap3beagle_flash_init();
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 57506da..d6bc88c 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -662,6 +662,12 @@ static struct omap_board_mux board_mux[] __initdata = {
#define board_mux NULL
#endif
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static void __init omap3_evm_init(void)
{
omap3_evm_get_revision();
@@ -701,7 +707,7 @@ static void __init omap3_evm_init(void)
omap_mux_init_gpio(135, OMAP_PIN_OUTPUT);
ehci_pdata.reset_gpio_port[1] = 135;
}
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
usb_ehci_init(&ehci_pdata);
ads7846_dev_init();
omap3evm_init_smsc911x();
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index a0acf8d..4827f46 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -557,6 +557,12 @@ static struct omap_board_mux board_mux[] __initdata = {
#define board_mux NULL
#endif
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static void __init omap3pandora_init(void)
{
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
@@ -569,7 +575,7 @@ static void __init omap3pandora_init(void)
omap3pandora_ads7846_init();
usb_ehci_init(&ehci_pdata);
pandora_keys_gpio_init();
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
/* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index 8252ba4..3943d0f 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -527,6 +527,12 @@ static void __init early_touchbook_revision(char **p)
}
__early_param("tbr=", early_touchbook_revision);
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static void __init omap3_touchbook_init(void)
{
pm_power_off = omap3_touchbook_poweroff;
@@ -545,7 +551,7 @@ static void __init omap3_touchbook_init(void)
spi_register_board_info(omap3_ads7846_spi_board_info,
ARRAY_SIZE(omap3_ads7846_spi_board_info));
omap3_ads7846_init();
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
usb_ehci_init(&ehci_pdata);
omap3touchbook_flash_init();
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 7e6aa82..50872a4 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -413,6 +413,12 @@ static struct omap_board_mux board_mux[] __initdata = {
#define board_mux NULL
#endif
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static void __init overo_init(void)
{
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
@@ -420,7 +426,7 @@ static void __init overo_init(void)
platform_add_devices(overo_devices, ARRAY_SIZE(overo_devices));
omap_serial_init();
overo_flash_init();
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
usb_ehci_init(&ehci_pdata);
overo_ads7846_init();
overo_init_smsc911x();
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 6a49f91..0ccb8b4 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -78,11 +78,17 @@ static struct omap_board_mux board_mux[] __initdata = {
#define board_mux NULL
#endif
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_PERIPHERAL,
+ .power = 0,
+};
+
static void __init rx51_init(void)
{
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
omap_serial_init();
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
rx51_peripherals_init();
/* Ensure SDRC pins are mux'd for self-refresh */
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 9a0821f..ca95d8d 100755
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -264,6 +264,12 @@ static int __init omap_i2c_init(void)
return 0;
}
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 100,
+};
+
static void enable_board_wakeup_source(void)
{
/* T2 interrupt line (keypad) */
@@ -275,6 +281,6 @@ void __init zoom_peripherals_init(void)
{
omap_i2c_init();
omap_serial_init();
- usb_musb_init();
+ usb_musb_init(&musb_board_data);
enable_board_wakeup_source();
}
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index ba71f76..2ddc316 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -146,7 +146,7 @@ static struct platform_device musb_device = {
.resource = musb_resources,
};
-void __init usb_musb_init(void)
+void __init usb_musb_init(struct omap_musb_board_data *board_data)
{
if (cpu_is_omap243x())
musb_resources[0].start = OMAP243X_HS_BASE;
@@ -159,6 +159,9 @@ void __init usb_musb_init(void)
* musb_core.c have been converted to use use clkdev.
*/
musb_plat.clock = "ick";
+ musb_plat.board_data = board_data;
+ musb_plat.power = board_data->power >> 1;
+ musb_plat.mode = board_data->mode;
if (platform_device_register(&musb_device) < 0) {
printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
@@ -167,7 +170,7 @@ void __init usb_musb_init(void)
}
#else
-void __init usb_musb_init(void)
+void __init usb_musb_init(struct omap_musb_board_data *board_data)
{
}
#endif /* CONFIG_USB_MUSB_SOC */
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 33a500e..288e29e 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -3,6 +3,7 @@
#ifndef __ASM_ARCH_OMAP_USB_H
#define __ASM_ARCH_OMAP_USB_H
+#include <linux/usb/musb.h>
#include <plat/board.h>
#define OMAP3_HS_USB_PORTS 3
@@ -42,7 +43,15 @@ struct ehci_hcd_omap_platform_data {
#define UDC_BASE OMAP2_UDC_BASE
#define OMAP_OHCI_BASE OMAP2_OHCI_BASE
-extern void usb_musb_init(void);
+struct omap_musb_board_data {
+ u8 interface_type;
+ u8 mode;
+ u8 power;
+};
+
+enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI};
+
+extern void usb_musb_init(struct omap_musb_board_data *board_data);
extern void usb_ehci_init(struct ehci_hcd_omap_platform_data *pdata);
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index d437556..5dc2f22 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -84,6 +84,9 @@ struct musb_hdrc_platform_data {
/* MUSB configuration-specific details */
struct musb_hdrc_config *config;
+
+ /* Architecture specific board data */
+ void *board_data;
};
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 05/11] omap: musb: remove unused data
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
` (3 preceding siblings ...)
2010-02-19 23:30 ` [PATCH 04/11] omap: musb: Pass board specific data from board file Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-19 23:30 ` [PATCH 06/11] arm: omap: musb: we can use clk framework Tony Lindgren
` (6 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Felipe Balbi <felipe.balbi@nokia.com>
eps_bits wasn't being used anywhere, let's remove it.
Cc: linux-usb at vger.kernel.org
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/usb-musb.c | 34 ----------------------------------
1 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 2ddc316..7e2ee01 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -68,39 +68,6 @@ static int musb_set_clock(struct clk *clk, int state)
return 0;
}
-static struct musb_hdrc_eps_bits musb_eps[] = {
- { "ep1_tx", 10, },
- { "ep1_rx", 10, },
- { "ep2_tx", 9, },
- { "ep2_rx", 9, },
- { "ep3_tx", 3, },
- { "ep3_rx", 3, },
- { "ep4_tx", 3, },
- { "ep4_rx", 3, },
- { "ep5_tx", 3, },
- { "ep5_rx", 3, },
- { "ep6_tx", 3, },
- { "ep6_rx", 3, },
- { "ep7_tx", 3, },
- { "ep7_rx", 3, },
- { "ep8_tx", 2, },
- { "ep8_rx", 2, },
- { "ep9_tx", 2, },
- { "ep9_rx", 2, },
- { "ep10_tx", 2, },
- { "ep10_rx", 2, },
- { "ep11_tx", 2, },
- { "ep11_rx", 2, },
- { "ep12_tx", 2, },
- { "ep12_rx", 2, },
- { "ep13_tx", 2, },
- { "ep13_rx", 2, },
- { "ep14_tx", 2, },
- { "ep14_rx", 2, },
- { "ep15_tx", 2, },
- { "ep15_rx", 2, },
-};
-
static struct musb_hdrc_config musb_config = {
.multipoint = 1,
.dyn_fifo = 1,
@@ -110,7 +77,6 @@ static struct musb_hdrc_config musb_config = {
.dma_channels = 7,
.dma_req_chan = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
.ram_bits = 12,
- .eps_bits = musb_eps,
};
static struct musb_hdrc_platform_data musb_plat = {
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 06/11] arm: omap: musb: we can use clk framework
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
` (4 preceding siblings ...)
2010-02-19 23:30 ` [PATCH 05/11] omap: musb: remove unused data Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-19 23:30 ` [PATCH 07/11] omap: musb: remove unused soft_con field Tony Lindgren
` (5 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Felipe Balbi <felipe.balbi@nokia.com>
... in order to handle musb's clock. Let's start
removing the old musb-only set_clock function.
Cc: linux-usb at vger.kernel.org
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/usb-musb.c | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 7e2ee01..c7d98a9 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -47,27 +47,6 @@ static struct resource musb_resources[] = {
},
};
-static int clk_on;
-
-static int musb_set_clock(struct clk *clk, int state)
-{
- if (state) {
- if (clk_on > 0)
- return -ENODEV;
-
- clk_enable(clk);
- clk_on = 1;
- } else {
- if (clk_on == 0)
- return -ENODEV;
-
- clk_disable(clk);
- clk_on = 0;
- }
-
- return 0;
-}
-
static struct musb_hdrc_config musb_config = {
.multipoint = 1,
.dyn_fifo = 1,
@@ -88,7 +67,6 @@ static struct musb_hdrc_platform_data musb_plat = {
.mode = MUSB_PERIPHERAL,
#endif
/* .clock is set dynamically */
- .set_clock = musb_set_clock,
.config = &musb_config,
/* REVISIT charge pump on TWL4030 can supply up to
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 07/11] omap: musb: remove unused soft_con field
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
` (5 preceding siblings ...)
2010-02-19 23:30 ` [PATCH 06/11] arm: omap: musb: we can use clk framework Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-19 23:30 ` [PATCH 08/11] omap: musb: remove unused dma data Tony Lindgren
` (4 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Felipe Balbi <felipe.balbi@nokia.com>
remove unused data.
Cc: linux-usb at vger.kernel.org
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/usb-musb.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index c7d98a9..01d86e5 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -50,7 +50,6 @@ static struct resource musb_resources[] = {
static struct musb_hdrc_config musb_config = {
.multipoint = 1,
.dyn_fifo = 1,
- .soft_con = 1,
.dma = 1,
.num_eps = 16,
.dma_channels = 7,
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 08/11] omap: musb: remove unused dma data
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
` (6 preceding siblings ...)
2010-02-19 23:30 ` [PATCH 07/11] omap: musb: remove unused soft_con field Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-19 23:30 ` [PATCH 09/11] omap: musb: remove unnecessary return Tony Lindgren
` (3 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Felipe Balbi <felipe.balbi@nokia.com>
we don't use those anywhere on musb driver, so
let's remove those old stuff.
Cc: linux-usb at vger.kernel.org
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/usb-musb.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 01d86e5..4dfb66a 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -50,10 +50,7 @@ static struct resource musb_resources[] = {
static struct musb_hdrc_config musb_config = {
.multipoint = 1,
.dyn_fifo = 1,
- .dma = 1,
.num_eps = 16,
- .dma_channels = 7,
- .dma_req_chan = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
.ram_bits = 12,
};
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 09/11] omap: musb: remove unnecessary return
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
` (7 preceding siblings ...)
2010-02-19 23:30 ` [PATCH 08/11] omap: musb: remove unused dma data Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-19 23:30 ` [PATCH 10/11] omap: musb: get rid of dyn_fifo Tony Lindgren
` (2 subsequent siblings)
11 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Felipe Balbi <felipe.balbi@nokia.com>
trivial patch, no functional changes.
Cc: linux-usb at vger.kernel.org
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/usb-musb.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 4dfb66a..2221a6c 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -103,10 +103,8 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
musb_plat.power = board_data->power >> 1;
musb_plat.mode = board_data->mode;
- if (platform_device_register(&musb_device) < 0) {
+ if (platform_device_register(&musb_device) < 0)
printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
- return;
- }
}
#else
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 10/11] omap: musb: get rid of dyn_fifo
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
` (8 preceding siblings ...)
2010-02-19 23:30 ` [PATCH 09/11] omap: musb: remove unnecessary return Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-23 14:55 ` Thomas Weber
2010-02-19 23:30 ` [PATCH 11/11] omap: musb: Add USB support to 4430 SDP board file Tony Lindgren
2010-02-20 8:30 ` [PATCH 00/11] omap updates for 2.6.34, part 4 Shilimkar, Santosh
11 siblings, 1 reply; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Felipe Balbi <felipe.balbi@nokia.com>
that's deprecated as we can check dyn_fifo from
CONFIGDATA register.
Cc: linux-usb at vger.kernel.org
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/usb-musb.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 2221a6c..85feb60 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -49,7 +49,6 @@ static struct resource musb_resources[] = {
static struct musb_hdrc_config musb_config = {
.multipoint = 1,
- .dyn_fifo = 1,
.num_eps = 16,
.ram_bits = 12,
};
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 10/11] omap: musb: get rid of dyn_fifo
2010-02-19 23:30 ` [PATCH 10/11] omap: musb: get rid of dyn_fifo Tony Lindgren
@ 2010-02-23 14:55 ` Thomas Weber
2010-02-23 15:09 ` Andreas Hartmetz
0 siblings, 1 reply; 22+ messages in thread
From: Thomas Weber @ 2010-02-23 14:55 UTC (permalink / raw)
To: linux-arm-kernel
Tony Lindgren wrote:
> From: Felipe Balbi <felipe.balbi@nokia.com>
>
> that's deprecated as we can check dyn_fifo from
> CONFIGDATA register.
>
> Cc: linux-usb at vger.kernel.org
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
> arch/arm/mach-omap2/usb-musb.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
> index 2221a6c..85feb60 100644
> --- a/arch/arm/mach-omap2/usb-musb.c
> +++ b/arch/arm/mach-omap2/usb-musb.c
> @@ -49,7 +49,6 @@ static struct resource musb_resources[] = {
>
> static struct musb_hdrc_config musb_config = {
> .multipoint = 1,
> - .dyn_fifo = 1,
> .num_eps = 16,
> .ram_bits = 12,
> };
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
Hi,
I think this patch breaks musb_hdrc.
In musb_core_init is musb->config->dyn_fifo checked but is never set.
So I get the following dmesg output:
musb_hdrc: ConfigData=0xde (UTMI-8, dyn FIFOs, bulk combine, bulk split,
HB-ISO Rx, HB-ISO Tx, SoftConn)
musb_hdrc: MHDRC RTL version 1.400
musb_core_init 1405: reconfigure software for Dynamic FIFOs
musb_hdrc musb_hdrc: musb_init_controller failed with status -19
Thomas
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 10/11] omap: musb: get rid of dyn_fifo
2010-02-23 14:55 ` Thomas Weber
@ 2010-02-23 15:09 ` Andreas Hartmetz
2010-02-23 15:20 ` Gadiyar, Anand
0 siblings, 1 reply; 22+ messages in thread
From: Andreas Hartmetz @ 2010-02-23 15:09 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 23, 2010 at 3:55 PM, Thomas Weber <weber@corscience.de> wrote:
> Tony Lindgren wrote:
>> From: Felipe Balbi <felipe.balbi@nokia.com>
>>
>> that's deprecated as we can check dyn_fifo from
>> CONFIGDATA register.
>>
>> Cc: linux-usb at vger.kernel.org
>> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
>> Signed-off-by: Tony Lindgren <tony@atomide.com>
>> ---
>> ?arch/arm/mach-omap2/usb-musb.c | ? ?1 -
>> ?1 files changed, 0 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
>> index 2221a6c..85feb60 100644
>> --- a/arch/arm/mach-omap2/usb-musb.c
>> +++ b/arch/arm/mach-omap2/usb-musb.c
>> @@ -49,7 +49,6 @@ static struct resource musb_resources[] = {
>>
>> ?static struct musb_hdrc_config musb_config = {
>> ? ? ? .multipoint ? ? = 1,
>> - ? ? .dyn_fifo ? ? ? = 1,
>> ? ? ? .num_eps ? ? ? ?= 16,
>> ? ? ? .ram_bits ? ? ? = 12,
>> ?};
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
>> the body of a message to majordomo at vger.kernel.org
>> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>>
>>
>>
> Hi,
>
> I think this patch breaks musb_hdrc.
>
> In musb_core_init is musb->config->dyn_fifo checked but is never set.
>
> So I get the following dmesg output:
>
> musb_hdrc: ConfigData=0xde (UTMI-8, dyn FIFOs, bulk combine, bulk split,
> HB-ISO Rx, HB-ISO Tx, SoftConn)
> musb_hdrc: MHDRC RTL version 1.400
> musb_core_init 1405: reconfigure software for Dynamic FIFOs
> musb_hdrc musb_hdrc: musb_init_controller failed with status -19
>
> Thomas
I think I have the same problem.
There are other problems right now (I'm trying several different
branch/defconfig
combinations) so I can't be 100% sure.
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 10/11] omap: musb: get rid of dyn_fifo
2010-02-23 15:09 ` Andreas Hartmetz
@ 2010-02-23 15:20 ` Gadiyar, Anand
2010-02-23 18:58 ` Tony Lindgren
0 siblings, 1 reply; 22+ messages in thread
From: Gadiyar, Anand @ 2010-02-23 15:20 UTC (permalink / raw)
To: linux-arm-kernel
> > I think this patch breaks musb_hdrc.
> >
> > In musb_core_init is musb->config->dyn_fifo checked but is never set.
> >
> > So I get the following dmesg output:
> >
> > musb_hdrc: ConfigData=0xde (UTMI-8, dyn FIFOs, bulk combine, bulk split,
> > HB-ISO Rx, HB-ISO Tx, SoftConn)
> > musb_hdrc: MHDRC RTL version 1.400
> > musb_core_init 1405: reconfigure software for Dynamic FIFOs
> > musb_hdrc musb_hdrc: musb_init_controller failed with status -19
> >
> > Thomas
>
> I think I have the same problem.
> There are other problems right now (I'm trying several different branch/defconfig
> combinations) so I can't be 100% sure.
>
Ajay reported earlier today [1] that there is a dependency patch [2]
that needs to be taken in. Looks like it was missed when the MUSB
patchset was added to linux-omap for extra testing.
- Anand
[1] http://marc.info/?l=linux-omap&m=126691578831301&w=2
[2] http://marc.info/?l=linux-omap&m=126088393130177&w=2
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 10/11] omap: musb: get rid of dyn_fifo
2010-02-23 15:20 ` Gadiyar, Anand
@ 2010-02-23 18:58 ` Tony Lindgren
0 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-23 18:58 UTC (permalink / raw)
To: linux-arm-kernel
* Gadiyar, Anand <gadiyar@ti.com> [100223 07:18]:
> > > I think this patch breaks musb_hdrc.
> > >
> > > In musb_core_init is musb->config->dyn_fifo checked but is never set.
> > >
> > > So I get the following dmesg output:
> > >
> > > musb_hdrc: ConfigData=0xde (UTMI-8, dyn FIFOs, bulk combine, bulk split,
> > > HB-ISO Rx, HB-ISO Tx, SoftConn)
> > > musb_hdrc: MHDRC RTL version 1.400
> > > musb_core_init 1405: reconfigure software for Dynamic FIFOs
> > > musb_hdrc musb_hdrc: musb_init_controller failed with status -19
> > >
> > > Thomas
> >
> > I think I have the same problem.
> > There are other problems right now (I'm trying several different branch/defconfig
> > combinations) so I can't be 100% sure.
> >
>
> Ajay reported earlier today [1] that there is a dependency patch [2]
> that needs to be taken in. Looks like it was missed when the MUSB
> patchset was added to linux-omap for extra testing.
>
> - Anand
>
> [1] http://marc.info/?l=linux-omap&m=126691578831301&w=2
> [2] http://marc.info/?l=linux-omap&m=126088393130177&w=2
Thanks, I'll drop this patch.
Sounds like Felipe is back from vacation and can then merge it via
linux-usb along with the other patch.
Regards,
Tony
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 11/11] omap: musb: Add USB support to 4430 SDP board file
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
` (9 preceding siblings ...)
2010-02-19 23:30 ` [PATCH 10/11] omap: musb: get rid of dyn_fifo Tony Lindgren
@ 2010-02-19 23:30 ` Tony Lindgren
2010-02-20 8:30 ` [PATCH 00/11] omap updates for 2.6.34, part 4 Shilimkar, Santosh
11 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
From: Maulik Mankad <x0082077@ti.com>
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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
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(-)
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 793ce8f..86b240e 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/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(void)
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)
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 85feb60..53a9638 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -87,10 +87,15 @@ static struct platform_device musb_device = {
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;
/*
diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h
index 2068b39..8fc15d3 100644
--- a/arch/arm/plat-omap/include/plat/omap44xx.h
+++ b/arch/arm/plat-omap/include/plat/omap44xx.h
@@ -45,6 +45,7 @@
#define OMAP44XX_MCPDM_L3_BASE 0x49032000
#define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000)
+#define OMAP44XX_HSUSB_OTG_BASE (L4_44XX_BASE + 0xAB000)
#endif /* __ASM_ARCH_OMAP44XX_H */
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 00/11] omap updates for 2.6.34, part 4
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
` (10 preceding siblings ...)
2010-02-19 23:30 ` [PATCH 11/11] omap: musb: Add USB support to 4430 SDP board file Tony Lindgren
@ 2010-02-20 8:30 ` Shilimkar, Santosh
2010-02-22 21:37 ` Tony Lindgren
11 siblings, 1 reply; 22+ messages in thread
From: Shilimkar, Santosh @ 2010-02-20 8:30 UTC (permalink / raw)
To: linux-arm-kernel
Tony,
> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Tony
> Lindgren
> Sent: Saturday, February 20, 2010 5:00 AM
> To: linux-arm-kernel at lists.infradead.org
> Cc: linux-omap at vger.kernel.org
> Subject: [PATCH 00/11] omap updates for 2.6.34, part 4
>
> Hi all,
>
> Here are few USB platform init patches that have been already
> posted to linux-usb and linux-omap and have been sitting in for-next.
>
> Posting them one more time to make sure people on linux-arm-kernel
> have seen these too.
>
> Regards,
>
> Tony
>
> ---
>
> Felipe Balbi (7):
> arm: omap: musb: ioremap only what's ours
> omap: musb: remove unused data
> arm: omap: musb: we can use clk framework
> omap: musb: remove unused soft_con field
> omap: musb: remove unused dma data
> omap: musb: remove unnecessary return
> omap: musb: get rid of dyn_fifo
>
> Maulik Mankad (4):
> USB: Add empty functions in otg.h
> omap: musb: Remove #ifdef from board-omap3evm.c
> omap: musb: Pass board specific data from board file
> omap: musb: Add USB support to 4430 SDP board file
>
We need attached patch to keep multi-omap build booting on omap4
on top of this series.
Regards,
Santosh
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-omap4-multi-omap-Allow-build-to-work.patch
Type: application/octet-stream
Size: 1407 bytes
Desc: 0001-omap4-multi-omap-Allow-build-to-work.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100220/136d9d16/attachment.obj>
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 00/11] omap updates for 2.6.34, part 4
2010-02-20 8:30 ` [PATCH 00/11] omap updates for 2.6.34, part 4 Shilimkar, Santosh
@ 2010-02-22 21:37 ` Tony Lindgren
0 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2010-02-22 21:37 UTC (permalink / raw)
To: linux-arm-kernel
* Shilimkar, Santosh <santosh.shilimkar@ti.com> [100220 00:27]:
> Tony,
>
> > -----Original Message-----
> > From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Tony
> > Lindgren
> > Sent: Saturday, February 20, 2010 5:00 AM
> > To: linux-arm-kernel at lists.infradead.org
> > Cc: linux-omap at vger.kernel.org
> > Subject: [PATCH 00/11] omap updates for 2.6.34, part 4
> >
> > Hi all,
> >
> > Here are few USB platform init patches that have been already
> > posted to linux-usb and linux-omap and have been sitting in for-next.
> >
> > Posting them one more time to make sure people on linux-arm-kernel
> > have seen these too.
> >
> > Regards,
> >
> > Tony
> >
> > ---
> >
> > Felipe Balbi (7):
> > arm: omap: musb: ioremap only what's ours
> > omap: musb: remove unused data
> > arm: omap: musb: we can use clk framework
> > omap: musb: remove unused soft_con field
> > omap: musb: remove unused dma data
> > omap: musb: remove unnecessary return
> > omap: musb: get rid of dyn_fifo
> >
> > Maulik Mankad (4):
> > USB: Add empty functions in otg.h
> > omap: musb: Remove #ifdef from board-omap3evm.c
> > omap: musb: Pass board specific data from board file
> > omap: musb: Add USB support to 4430 SDP board file
> >
> We need attached patch to keep multi-omap build booting on omap4
> on top of this series.
Thanks, I'll add it.
Tony
^ permalink raw reply [flat|nested] 22+ messages in thread