omap2: ehci: Make Overo compile again
Subsystems (3)
PATCH 1/1 omap2: ehci: Make Overo compile again
Overo needs the same changes as the other boards do for the ehci changes.
arch/arm/mach-omap2/board-overo.c +14 -1
@@ -384,6 +384,19 @@ static struct platform_device *overo_devices[] __initdata = { &overo_lcd_device, }; +static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { + .port_mode[0 ] =EHCI_HCD_OMAP_MODE_PHY , + .port_mode[1 ] =EHCI_HCD_OMAP_MODE_UNKNOWN , + .port_mode[2 ] =EHCI_HCD_OMAP_MODE_UNKNOWN , + + .chargepump = false, + .phy_reset = true, + .reset_gpio_port[0 ] =183 , + .reset_gpio_port[1 ] = -EINVAL , + .reset_gpio_port[2 ] = -EINVAL +}; + +static void __init overo_init (void ) {overo_i2c_init ();
@@ -391,7 +404,7 @@ static void __init overo_init(void)omap_serial_init ();overo_flash_init ();usb_musb_init (); -usb_ehci_init (EHCI_HCD_OMAP_MODE_PHY , false, true,183 , -EINVAL ); +usb_ehci_init (&ehci_pdata);overo_ads7846_init ();overo_init_smsc911x ();
PATCH v2 1/1 omap2: ehci: Make Overo compile again
Overo needs the same changes as the other platforms do for the ehci changes.
Also, roll in the corresponding change from Steve Sakoman fixing the port setup (removing the redundant GPIO setup and switching to port 2).
---
arch/arm/mach-omap2/board-overo.c +14 -9
@@ -384,6 +384,19 @@ static struct platform_device *overo_devices[] __initdata = { &overo_lcd_device, }; +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 , + .port_mode[2 ] =EHCI_HCD_OMAP_MODE_UNKNOWN , + + .chargepump = false, + .phy_reset = true, + .reset_gpio_port[0 ] = -EINVAL , + .reset_gpio_port[1 ] =OVERO_GPIO_USBH_NRESET , + .reset_gpio_port[2 ] = -EINVAL +}; + +static void __init overo_init (void ) {overo_i2c_init ();
@@ -391,7 +404,7 @@ static void __init overo_init(void)omap_serial_init ();overo_flash_init ();usb_musb_init (); -usb_ehci_init (EHCI_HCD_OMAP_MODE_PHY , false, true,183 , -EINVAL ); +usb_ehci_init (&ehci_pdata);overo_ads7846_init ();overo_init_smsc911x ();
@@ -434,14 +447,6 @@ static void __init overo_init(void)else printk (KERN_ERR "could not obtain gpio for " "OVERO_GPIO_USBH_CPEN\n" ); - -if ((gpio_request (OVERO_GPIO_USBH_NRESET , -"OVERO_GPIO_USBH_NRESET" ) ==0 ) && - (gpio_direction_output (OVERO_GPIO_USBH_NRESET ,1 ) ==0 )) -gpio_export (OVERO_GPIO_USBH_NRESET ,0 ); -else -printk (KERN_ERR "could not obtain gpio for " -"OVERO_GPIO_USBH_NRESET\n" ); }static void __init overo_map_io (void )
Tony Lindgren
maintainerQuoted 6 lines · Olof Johansson
Overo needs the same changes as the other platforms do for the ehci changes.
Also, roll in the corresponding change from Steve Sakoman fixing the port setup (removing the redundant GPIO setup and switching to port 2).
Signed-off-by Olof Johansson <[email protected]>
Sakoman, does this look OK to you?
Tony
Quoted 51 lines
---
arch/arm/mach-omap2/board-overo.c +14
-9@@ -384,6 +384,19 @@ static struct platform_device *overo_devices[] __initdata = { &overo_lcd_device, }; +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 , + .port_mode[2 ] =EHCI_HCD_OMAP_MODE_UNKNOWN , + + .chargepump = false, + .phy_reset = true, + .reset_gpio_port[0 ] = -EINVAL , + .reset_gpio_port[1 ] =OVERO_GPIO_USBH_NRESET , + .reset_gpio_port[2 ] = -EINVAL +}; + +static void __init overo_init (void ) {overo_i2c_init ();@@ -391,7 +404,7 @@ static void __init overo_init(void)omap_serial_init ();overo_flash_init ();usb_musb_init (); -usb_ehci_init (EHCI_HCD_OMAP_MODE_PHY , false, true,183 , -EINVAL ); +usb_ehci_init (&ehci_pdata);overo_ads7846_init ();overo_init_smsc911x ();@@ -434,14 +447,6 @@ static void __init overo_init(void)else printk (KERN_ERR "could not obtain gpio for " "OVERO_GPIO_USBH_CPEN\n" ); - -if ((gpio_request (OVERO_GPIO_USBH_NRESET , -"OVERO_GPIO_USBH_NRESET" ) ==0 ) && - (gpio_direction_output (OVERO_GPIO_USBH_NRESET ,1 ) ==0 )) -gpio_export (OVERO_GPIO_USBH_NRESET ,0 ); -else -printk (KERN_ERR "could not obtain gpio for " -"OVERO_GPIO_USBH_NRESET\n" ); }static void __init overo_map_io (void )
Steve Sakoman
Acked-byQuoted 9 lines · Tony Lindgren
Quoted 6 lines · Olof Johansson
Overo needs the same changes as the other platforms do for the ehci changes.
Also, roll in the corresponding change from Steve Sakoman fixing the port setup (removing the redundant GPIO setup and switching to port 2).
Signed-off-by Olof Johansson <[email protected]>Sakoman, does this look OK to you?
Yes, looks correct to me.
Steve
Quoted 47 lines
Quoted 47 lines
arch/arm/mach-omap2/board-overo.c +14
-1@@ -384,6 +384,19 @@ static struct platform_device *overo_devices[] __initdata = { &overo_lcd_device, }; +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, + .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, + + .chargepump = false, + .phy_reset = true, + .reset_gpio_port[0] = -EINVAL, + .reset_gpio_port[1] = OVERO_GPIO_USBH_NRESET, + .reset_gpio_port[2] = -EINVAL +}; + + static void __init overo_init(void) { overo_i2c_init();@@ -391,7 +404,7 @@ static void __init overo_init(void) omap_serial_init(); overo_flash_init(); usb_musb_init(); - usb_ehci_init(EHCI_HCD_OMAP_MODE_PHY, false, true, 183, -EINVAL); + usb_ehci_init(&ehci_pdata); overo_ads7846_init(); overo_init_smsc911x();@@ -434,14 +447,6 @@ static void __init overo_init(void)else
printk(KERN_ERR "could not obtain gpio for " "OVERO_GPIO_USBH_CPEN\n"); -
- if ((gpio_request(OVERO_GPIO_USBH_NRESET,
- "OVERO_GPIO_USBH_NRESET") == 0) &&
- (gpio_direction_output(OVERO_GPIO_USBH_NRESET, 1)== 0))
-gpio_export(OVERO_GPIO_USBH_NRESET, 0);
- else
- printk(KERN_ERR "could not obtain gpio for "
- "OVERO_GPIO_USBH_NRESET\n"); }
Quoted 2 lines
Quoted 1 line
static void
__initovero_map_io(void)
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Tony Lindgren
maintainerPATCH v2 1/1 omap2: ehci: Make Overo compile again
In reply to Olof JohanssonThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: ehci
Initial commit ID (Likely to change): d6e0043604d57226dd9388f988a608dabb2f6a84
PatchWorks
http://patchwork.kernel.org/patch/49344/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=d6e0043604d57226dd9388f988a608dabb2f6a84