OMAP: Add USB transceiver interface type
This patch proposes to pass transceiver interface type (ULPI/UTMI)
from the board file.
OMAP4 MUSB provides two options to interface with the transceiver.
(1) MUSB communicates with an ON chip transceiver using UTMI.
(2) MUSB communicates with an OFF chip transceiver using ULPI.
The driver shall program the OTG_INTERFSEL register as per the
information passed from the board file.
Signed-off-by: Maulik Mankad <x0082077@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Felipe Balbi <felipe.balbi@xxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Index: linux-2.6/include/linux/usb/musb.h
===================================================================
--- linux-2.6.orig/include/linux/usb/musb.h
+++ linux-2.6/include/linux/usb/musb.h
@@ -61,6 +61,9 @@ struct musb_hdrc_platform_data {
/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */
u8 mode;
+ /* ULPI / UTMI based on transceiver interface */
+ u8 interface_type;
+
/* for clk_get() */
const char *clock;
Index: linux-2.6/arch/arm/plat-omap/include/plat/usb.h
===================================================================
--- linux-2.6.orig/arch/arm/plat-omap/include/plat/usb.h
+++ linux-2.6/arch/arm/plat-omap/include/plat/usb.h
@@ -42,7 +42,8 @@ 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);
+enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI};
+extern void usb_musb_init(enum musb_interface interface);
extern void usb_ehci_init(struct ehci_hcd_omap_platform_data *pdata);
Index: linux-2.6/arch/arm/mach-omap2/board-2430sdp.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-2430sdp.c
+++ linux-2.6/arch/arm/mach-omap2/board-2430sdp.c
@@ -203,7 +203,7 @@ static void __init omap_2430sdp_init(voi
platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));
omap_serial_init();
twl4030_mmc_init(mmc);
- usb_musb_init();
+ usb_musb_init(MUSB_INTERFACE_ULPI);
board_smc91x_init();
/* Turn off secondary LCD backlight */
Index: linux-2.6/arch/arm/mach-omap2/board-3430sdp.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-3430sdp.c
+++ linux-2.6/arch/arm/mach-omap2/board-3430sdp.c
@@ -664,7 +664,7 @@ static void __init omap_3430sdp_init(voi
ARRAY_SIZE(sdp3430_spi_board_info));
ads7846_dev_init();
omap_serial_init();
- usb_musb_init();
+ usb_musb_init(MUSB_INTERFACE_ULPI);
board_smc91x_init();
sdp3430_display_init();
enable_board_wakeup_source();
Index: linux-2.6/arch/arm/mach-omap2/board-ldp.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-ldp.c
+++ linux-2.6/arch/arm/mach-omap2/board-ldp.c
@@ -394,7 +394,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_INTERFACE_ULPI);
twl4030_mmc_init(mmc);
/* link regulators to MMC adapters */
Index: linux-2.6/arch/arm/mach-omap2/board-omap3beagle.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-omap3beagle.c
+++ linux-2.6/arch/arm/mach-omap2/board-omap3beagle.c
@@ -443,7 +443,7 @@ static void __init omap3_beagle_init(voi
/* REVISIT leave DVI powered down until it's needed ... */
gpio_direction_output(170, true);
- usb_musb_init();
+ usb_musb_init(MUSB_INTERFACE_ULPI);
usb_ehci_init(&ehci_pdata);
omap3beagle_flash_init();
Index: linux-2.6/arch/arm/mach-omap2/board-omap3evm.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-omap3evm.c
+++ linux-2.6/arch/arm/mach-omap2/board-omap3evm.c
@@ -469,7 +469,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_INTERFACE_ULPI);
usb_ehci_init(&ehci_pdata);
ads7846_dev_init();
omap3evm_init_smsc911x();
Index: linux-2.6/arch/arm/mach-omap2/board-omap3pandora.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-omap3pandora.c
+++ linux-2.6/arch/arm/mach-omap2/board-omap3pandora.c
@@ -413,7 +413,7 @@ static void __init omap3pandora_init(voi
omap3pandora_ads7846_init();
usb_ehci_init(&ehci_pdata);
pandora_keys_gpio_init();
- usb_musb_init();
+ usb_musb_init(MUSB_INTERFACE_ULPI);
/* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
Index: linux-2.6/arch/arm/mach-omap2/board-overo.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-overo.c
+++ linux-2.6/arch/arm/mach-omap2/board-overo.c
@@ -420,7 +420,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_INTERFACE_ULPI);
usb_ehci_init(&ehci_pdata);
overo_ads7846_init();
overo_init_smsc911x();
Index: linux-2.6/arch/arm/mach-omap2/board-rx51.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-rx51.c
+++ linux-2.6/arch/arm/mach-omap2/board-rx51.c
@@ -82,7 +82,7 @@ static void __init rx51_init(void)
{
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
omap_serial_init();
- usb_musb_init();
+ usb_musb_init(MUSB_INTERFACE_ULPI);
rx51_peripherals_init();
/* Ensure SDRC pins are mux'd for self-refresh */
Index: linux-2.6/arch/arm/mach-omap2/board-zoom-peripherals.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ linux-2.6/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -267,5 +267,6 @@ void __init zoom_peripherals_init(void)
{
omap_i2c_init();
omap_serial_init();
- usb_musb_init();
+ usb_musb_init(MUSB_INTERFACE_ULPI);
+
}
Index: linux-2.6/arch/arm/mach-omap2/usb-musb.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/usb-musb.c
+++ linux-2.6/arch/arm/mach-omap2/usb-musb.c
@@ -130,6 +130,7 @@ static struct musb_hdrc_platform_data mu
* "mode", and should be passed to usb_musb_init().
*/
.power = 50, /* up to 100 mA */
+ .interface_type = MUSB_INTERFACE_ULPI, /* Default interface is ULPI */
};
static u64 musb_dmamask = DMA_BIT_MASK(32);
@@ -146,7 +147,7 @@ static struct platform_device musb_devic
.resource = musb_resources,
};
-void __init usb_musb_init(void)
+void __init usb_musb_init(enum musb_interface interface)
{
if (cpu_is_omap243x())
musb_resources[0].start = OMAP243X_HS_BASE;
@@ -159,6 +160,7 @@ void __init usb_musb_init(void)
* musb_core.c have been converted to use use clkdev.
*/
musb_plat.clock = "ick";
+ musb_plat.interface_type = interface;
if (platform_device_register(&musb_device) < 0) {
printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
@@ -167,7 +169,7 @@ void __init usb_musb_init(void)
}
#else
-void __init usb_musb_init(void)
+void __init usb_musb_init(enum musb_interface interface)
{
}
#endif /* CONFIG_USB_MUSB_SOC */
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
