omap updates for 2.6.34, part 4
Subsystems (5)
Tony Lindgren
maintainercover 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
arch/arm/mach-omap2/board-2430sdp.c | 8 ++- arch/arm/mach-omap2/board-3430sdp.c | 8 ++- arch/arm/mach-omap2/board-4430sdp.c | 10 +++ 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 | 12 +++- 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 | 83 ++++---------------------- arch/arm/plat-omap/include/plat/omap44xx.h | 1 arch/arm/plat-omap/include/plat/usb.h | 11 +++ include/linux/usb/musb.h | 3 + include/linux/usb/otg.h | 10 +++ 19 files changed, 141 insertions(+), 85 deletions(-)
Signature · 1 line
Signature
Tony Lindgren
maintainerPATCH 1/11 USB: Add empty functions in otg.h
From: Maulik Mankad <[email protected]>
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.
--- include/linux/usb/otg.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
include/linux/usb/otg.h +10 -0
@@ -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)
Tony Lindgren
maintainerPATCH 2/11 omap: musb: Remove #ifdef from board-omap3evm.c
In reply to Tony LindgrenFrom: Maulik Mankad <[email protected]>
This patch removes #ifdef around usb_nop_xceiv_register() from board-omap3evm.c
--- arch/arm/mach-omap2/board-omap3evm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-omap3evm.c +2 -2
@@ -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 );
Tony Lindgren
maintainerPATCH 3/11 arm: omap: musb: ioremap only what's ours
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
omap3430 TRM says the OTG address space is 4k, not 8k.
--- arch/arm/mach-omap2/usb-musb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/usb-musb.c +1 -1
@@ -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
PATCH 3/11 arm: omap: musb: ioremap only what's ours
Hi,
Quoted 25 lines
-----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 oursFrom: Felipe Balbi <[email protected]>
omap3430 TRM says the OTG address space is 4k, not 8k.
Cc linux-usb at vger.kernel.orgSigned-off-by Felipe Balbi <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap2/usb-musb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/arm/mach-omap2/usb- renamed from arch/arm/mach-omap2/usb-musb.c +0
-0
musb.c
index a80441d..ba71f76 100644
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(void) · line 155
Quoted 5 lines
arch/arm/mach-omap2/usb-musb.c +1
-1@@ -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
Quoted 8 lines
arch/arm/mach-omap2/usb-musb.c +0
-1/* * 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
Tony Lindgren
maintainerPATCH 3/11 arm: omap: musb: ioremap only what's ours
Quoted 35 lines · Aguirre, Sergio
Hi,
Quoted 25 lines
-----Original Message-----
From: [email protected] [mailto:linux-omap- [email protected]] On Behalf Of Tony Lindgren
Sent: Friday, February 19, 2010 5:30 PM
To: [email protected]
Cc: Felipe Balbi; [email protected]; [email protected]
Subject: [PATCH 03/11] arm: omap: musb: ioremap only what's oursFrom: Felipe Balbi <[email protected]>
omap3430 TRM says the OTG address space is 4k, not 8k.
Signed-off-by Felipe Balbi <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap2/usb-musb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/arm/mach-omap2/usb- renamed from arch/arm/mach-omap2/usb-musb.c +0
-0
musb.c
index a80441d..ba71f76 100644arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(void) · line 155
Quoted 5 lines
arch/arm/mach-omap2/usb-musb.c +1
-1@@ -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...
Quoted 1 line
Is this valid also if
cpu_is_243x()?
Yes, the other 4K is for the L4 interconnect.
Tony
PATCH 3/11 arm: omap: musb: ioremap only what's ours
Hi Tony,
Quoted 45 lines
-----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 oursQuoted 8 lines · Aguirre, Sergio
Hi,
Quoted 6 lines
-----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
Quoted 27 lines
Quoted 19 lines
Subject: [PATCH 03/11] arm: omap: musb: ioremap only what's ours
From: Felipe Balbi <[email protected]>
omap3430 TRM says the OTG address space is 4k, not 8k.
Cc linux-usb at vger.kernel.orgSigned-off-by Felipe Balbi <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap2/usb-musb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/arm/mach-omap2/usb- renamed from arch/arm/mach-omap2/usb-musb.c +0
-0
musb.c
index a80441d..ba71f76 100644arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(void) · line 155
Quoted 5 lines
arch/arm/mach-omap2/usb-musb.c +1
-1@@ -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...
Quoted 3 lines
Quoted 1 line
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
Quoted 2 lines
Tony
Tony Lindgren
maintainerPATCH 3/11 arm: omap: musb: ioremap only what's ours
Quoted 51 lines · Aguirre, Sergio
Hi Tony,
Quoted 45 lines
-----Original Message-----
From: Tony Lindgren [mailto:[email protected]]
Sent: Friday, February 19, 2010 5:44 PM
To: Aguirre, Sergio
Cc: [email protected]; Felipe Balbi; linux- [email protected]; [email protected]
Subject: Re: [PATCH 03/11] arm: omap: musb: ioremap only what's oursQuoted 8 lines · Aguirre, Sergio
Hi,
Quoted 6 lines
-----Original Message-----
From: [email protected] [mailto:linux-omap- [email protected]] On Behalf Of Tony Lindgren
Sent: Friday, February 19, 2010 5:30 PM
To: [email protected]
Cc: Felipe Balbi; [email protected]; linux-Quoted 27 lines
Quoted 19 lines
Subject: [PATCH 03/11] arm: omap: musb: ioremap only what's ours
From: Felipe Balbi <[email protected]>
omap3430 TRM says the OTG address space is 4k, not 8k.
Signed-off-by Felipe Balbi <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap2/usb-musb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/arm/mach-omap2/usb- renamed from arch/arm/mach-omap2/usb-musb.c +0
-0
musb.c
index a80441d..ba71f76 100644arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(void) · line 155
Quoted 5 lines
arch/arm/mach-omap2/usb-musb.c +1
-1@@ -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...
Quoted 3 lines
Quoted 1 line
Is this valid also if
cpu_is_243x()?Yes, the other 4K is for the L4 interconnect.
Quoted 7 lines
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
Tony Lindgren
maintainerPATCH 4/11 omap: musb: Pass board specific data from board file
In reply to Tony LindgrenFrom: Maulik Mankad <[email protected]>
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.
--- 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(-)
arch/arm/mach-omap2/board-2430sdp.c +7 -1
@@ -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 */
arch/arm/mach-omap2/board-3430sdp.c +7 -1
@@ -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 ();
arch/arm/mach-omap2/board-cm-t35.c +7 -1
@@ -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" )
arch/arm/mach-omap2/board-devkit8000.c +7 -1
@@ -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 ();
arch/arm/mach-omap2/board-igep0020.c +7 -1
@@ -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 ();
arch/arm/mach-omap2/board-ldp.c +7 -1
@@ -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 */
arch/arm/mach-omap2/board-omap3beagle.c +7 -1
@@ -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 ();
arch/arm/mach-omap2/board-omap3evm.c +7 -1
@@ -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 ();
arch/arm/mach-omap2/board-omap3pandora.c +7 -1
@@ -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 );
arch/arm/mach-omap2/board-omap3touchbook.c +7 -1
@@ -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 ();
arch/arm/mach-omap2/board-overo.c +7 -1
@@ -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 ();
arch/arm/mach-omap2/board-rx51.c +7 -1
@@ -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 */
arch/arm/mach-omap2/board-zoom-peripherals.c +7 -1
@@ -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 (); }
arch/arm/mach-omap2/usb-musb.c +5 -2
@@ -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 */
arch/arm/plat-omap/include/plat/usb.h +10 -1
@@ -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);
include/linux/usb/musb.h +3 -0
@@ -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; };
Tony Lindgren
maintainerPATCH 5/11 omap: musb: remove unused data
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
eps_bits wasn't being used anywhere, let's remove it.
--- arch/arm/mach-omap2/usb-musb.c | 34 ---------------------------------- 1 files changed, 0 insertions(+), 34 deletions(-)
arch/arm/mach-omap2/usb-musb.c +0 -34
@@ -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 = {
Tony Lindgren
maintainerPATCH 6/11 arm: omap: musb: we can use clk framework
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
... in order to handle musb's clock. Let's start
removing the old musb-only set_clock function.
--- arch/arm/mach-omap2/usb-musb.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-)
arch/arm/mach-omap2/usb-musb.c +0 -22
@@ -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
Tony Lindgren
maintainerPATCH 7/11 omap: musb: remove unused soft_con field
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
remove unused data.
--- arch/arm/mach-omap2/usb-musb.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/usb-musb.c +0 -1
@@ -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 ,
Tony Lindgren
maintainerPATCH 8/11 omap: musb: remove unused dma data
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
we don't use those anywhere on musb driver, so let's remove those old stuff.
--- arch/arm/mach-omap2/usb-musb.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/usb-musb.c +0 -3
@@ -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 , };
Tony Lindgren
maintainerPATCH 9/11 omap: musb: remove unnecessary return
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
trivial patch, no functional changes.
--- arch/arm/mach-omap2/usb-musb.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/usb-musb.c +1 -3
@@ -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
Tony Lindgren
maintainerPATCH 10/11 omap: musb: get rid of dyn_fifo
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
that's deprecated as we can check dyn_fifo from
CONFIGDATA register.
--- arch/arm/mach-omap2/usb-musb.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/usb-musb.c +0 -1
@@ -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 , };
RE: [PATCH 10/11] omap: musb: get rid of dyn_fifo
Quoted 8 lines
-----Original Message-----
From: [email protected] [mailto:linux-arm- [email protected]] On Behalf Of Tony Lindgren
Sent: Saturday, February 20, 2010 5:01 AM
To: [email protected]
Cc: Felipe Balbi; [email protected]; [email protected]
Subject: [PATCH 10/11] omap: musb: get rid ofdyn_fifo
Quoted 8 lines
From: Felipe Balbi <[email protected]>
that's deprecated as we can check
dyn_fifofrom
CONFIGDATA register.Signed-off-by Felipe Balbi <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Felipe,
This patch causes musb init failure if below patch[1] is not taken.
[1] http://marc.info/?l=linux-omap&m=126088393130177&w=2
I don't see patch [1] in Greg's queue also so please forward it to Greg.
Regards,
Ajay
Quoted 23 lines
--- arch/arm/mach-omap2/usb-musb.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)arch/arm/mach-omap2/usb- renamed from arch/arm/mach-omap2/usb-musb.c +0
-0
musb.c
index 2221a6c..85feb60 100644arch/arm/mach-omap2/usb-musb.c +0
-1@@ -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 , };_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 10/11 omap: musb: get rid of dyn_fifo
In reply to Tony LindgrenQuoted 26 lines · Tony Lindgren
From: Felipe Balbi <[email protected]>
that's deprecated as we can check
dyn_fifofrom
CONFIGDATA register.Cc linux-usb at vger.kernel.orgSigned-off-by Felipe Balbi <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap2/usb-musb.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)arch/arm/mach-omap2/usb-musb.c +0
-2@@ -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 , }; --
Quoted 6 lines
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.400musb_core_init 1405: reconfigure software for Dynamic FIFOs musb_hdrc musb_hdrc: musb_init_controller failed with status -19
Thomas
PATCH 10/11 omap: musb: get rid of dyn_fifo
Quoted 41 lines · Thomas Weber
Quoted 26 lines · Tony Lindgren
From: Felipe Balbi <[email protected]>
that's deprecated as we can check
dyn_fifofrom
CONFIGDATA register.Cc linux-usb at vger.kernel.orgSigned-off-by Felipe Balbi <[email protected]>Signed-off-by Tony Lindgren <[email protected]>---
?arch/arm/mach-omap2/usb-musb.c | ? ?1 -
?1 files changed, 0 insertions(+), 1 deletions(-)arch/arm/mach-omap2/usb-musb.c +0
-2@@ -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, ?}; --Quoted 6 lines
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.htmlHi,
I think this patch breaks
musb_hdrc.In
musb_core_initismusb->config->dyn_fifochecked but is never set.So I get the following dmesg output:
Quoted 7 lines
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.400musb_core_init1405: reconfigure software for Dynamic FIFOsmusb_hdrcmusb_hdrc:musb_init_controllerfailed with status -19Thomas
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.
PATCH 10/11 omap: musb: get rid of dyn_fifo
Quoted 12 lines
Quoted 12 lines
I think this patch breaks
musb_hdrc.In
musb_core_initismusb->config->dyn_fifochecked 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.400musb_core_init1405: reconfigure software for Dynamic FIFOsmusb_hdrcmusb_hdrc:musb_init_controllerfailed with status -19
Quoted 6 lines
Quoted 1 line
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
Tony Lindgren
maintainerPATCH 10/11 omap: musb: get rid of dyn_fifo
Quoted 19 lines · Gadiyar, Anand
Quoted 12 lines
Quoted 12 lines
I think this patch breaks
musb_hdrc.In
musb_core_initismusb->config->dyn_fifochecked 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.400musb_core_init1405: reconfigure software for Dynamic FIFOsmusb_hdrcmusb_hdrc:musb_init_controllerfailed with status -19Quoted 6 lines
Quoted 1 line
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.
Quoted 8 lines
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
Tony Lindgren
maintainerPATCH 11/11 omap: musb: Add USB support to 4430 SDP board file
In reply to Tony LindgrenFrom: Maulik Mankad <[email protected]>
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.
--- 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(-)
arch/arm/mach-omap2/board-4430sdp.c +10 -0
@@ -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 )
arch/arm/mach-omap2/usb-musb.c +7 -2
@@ -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 ;/*
arch/arm/plat-omap/include/plat/omap44xx.h +1 -0
@@ -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 */
cover omap updates for 2.6.34, part 4
In reply to Tony LindgrenTony,
Quoted 31 lines
-----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 4Hi 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 unusedsoft_confield
omap: musb: remove unused dma data
omap: musb: remove unnecessary return
omap: musb: get rid ofdyn_fifo
Quoted 6 lines
Maulik Mankad (4):
USB: Add empty functions inotg.h
omap: musb: Remove #ifdef fromboard-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>
Tony Lindgren
maintainercover omap updates for 2.6.34, part 4
Quoted 33 lines · Shilimkar, Santosh
Tony,
Quoted 31 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Tony Lindgren
Sent: Saturday, February 20, 2010 5:00 AM
To: [email protected]
Cc: [email protected]
Subject: [PATCH 00/11] omap updates for 2.6.34, part 4Hi 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 unusedsoft_confield
omap: musb: remove unused dma data
omap: musb: remove unnecessary return
omap: musb: get rid ofdyn_fifo
Quoted 8 lines
Quoted 6 lines
Maulik Mankad (4):
USB: Add empty functions inotg.h
omap: musb: Remove #ifdef fromboard-omap3evm.c
omap: musb: Pass board specific data from board file
omap: musb: Add USB support to 4430 SDP board fileWe need attached patch to keep multi-omap build booting on omap4 on top of this series.
Thanks, I'll add it.
Tony