RE: [PATCH RFC 4/5] omap: 3430sdp: add ohci platform init

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Anand,

> -----Original Message-----
> From: Gadiyar, Anand
> Sent: Friday, April 02, 2010 10:04 AM
> To: linux-usb@xxxxxxxxxxxxxxx; linux-omap@xxxxxxxxxxxxxxx
> Cc: David Brownell; Gregory Clement; Felipe Balbi; Aguirre, Sergio;
> Gadiyar, Anand
> Subject: [PATCH RFC 4/5] omap: 3430sdp: add ohci platform init
> 
> Add platform initialization code for OHCI on the 3430SDP.
> 
> Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
> ---
>  arch/arm/mach-omap2/board-3430sdp.c |    7 +++++++
>  1 file changed, 7 insertions(+)
> 
> 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
> @@ -675,6 +675,12 @@ static const struct ehci_hcd_omap_platfo
>  	.reset_gpio_port[2]  = -EINVAL
>  };
> 
> +static const struct ohci_hcd_omap_platform_data ohci_pdata __initconst =
> {
> +	.port_mode[0] = OMAP_OHCI_PORT_MODE_UNUSED,
> +	.port_mode[1] = OMAP_OHCI_PORT_MODE_UNUSED,
> +	.port_mode[2] = OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0,
> +};

I just noticed that this patch broke the 3430sdp build for me.

I see following error:

arch/arm/mach-omap2/board-3430sdp.c: In function 'omap_3430sdp_init':
arch/arm/mach-omap2/board-3430sdp.c:840: error: ohci_pdata causes a section type conflict

Removing the "const", to make it similar to ehci struct above it, solves the problem.

Regards,
Sergio

> +
>  #ifdef CONFIG_OMAP_MUX
>  static struct omap_board_mux board_mux[] __initdata = {
>  	{ .reg_offset = OMAP_MUX_TERMINATOR },
> @@ -817,6 +823,7 @@ static void __init omap_3430sdp_init(voi
>  	sdp3430_display_init();
>  	enable_board_wakeup_source();
>  	usb_ehci_init(&ehci_pdata);
> +	usb_ohci_init(&ohci_pdata);
>  }
> 
>  static void __init omap_3430sdp_map_io(void)
--
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

[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux