Re: [PATCH] arch: mips: update platform data for JZ4740 usb devicecontroller

[Lars-Peter Clausen]

On 12/19/2013 10:11 PM, Apelete Seketeli wrote:
> The platform data already available in tree for JZ4740 USB Device
> Controller was previously used by an out-of-tree USB gadget driver
> which was not relying on the musb driver and was written by Ingenic
> and the Qi-Hardware community.
> 
> Update platform data for JZ4740 USB device controller to be used with
> musb driver.
> 
> Signed-off-by: Apelete Seketeli <apelete@xxxxxxxxxxxx>

Acked-by: Lars-Peter Clausen <lars@xxxxxxxxxx>

> ---
>  arch/mips/include/asm/mach-jz4740/platform.h |    1 +
>  arch/mips/jz4740/board-qi_lb60.c             |    1 +
>  arch/mips/jz4740/platform.c                  |   40 +++++++++++++++-----------
>  3 files changed, 26 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/mips/include/asm/mach-jz4740/platform.h b/arch/mips/include/asm/mach-jz4740/platform.h
> index 05988c2..069b43a 100644
> --- a/arch/mips/include/asm/mach-jz4740/platform.h
> +++ b/arch/mips/include/asm/mach-jz4740/platform.h
> @@ -21,6 +21,7 @@
>  
>  extern struct platform_device jz4740_usb_ohci_device;
>  extern struct platform_device jz4740_udc_device;
> +extern struct platform_device jz4740_udc_xceiv_device;
>  extern struct platform_device jz4740_mmc_device;
>  extern struct platform_device jz4740_rtc_device;
>  extern struct platform_device jz4740_i2c_device;
> diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
> index 8a5ec0e..c01900e 100644
> --- a/arch/mips/jz4740/board-qi_lb60.c
> +++ b/arch/mips/jz4740/board-qi_lb60.c
> @@ -427,6 +427,7 @@ static struct platform_device qi_lb60_audio_device = {
>  
>  static struct platform_device *jz_platform_devices[] __initdata = {
>  	&jz4740_udc_device,
> +	&jz4740_udc_xceiv_device,
>  	&jz4740_mmc_device,
>  	&jz4740_nand_device,
>  	&qi_lb60_keypad,
> diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
> index df65677..1be41e2 100644
> --- a/arch/mips/jz4740/platform.c
> +++ b/arch/mips/jz4740/platform.c
> @@ -21,6 +21,8 @@
>  
>  #include <linux/dma-mapping.h>
>  
> +#include <linux/usb/musb.h>
> +
>  #include <asm/mach-jz4740/platform.h>
>  #include <asm/mach-jz4740/base.h>
>  #include <asm/mach-jz4740/irq.h>
> @@ -56,29 +58,35 @@ struct platform_device jz4740_usb_ohci_device = {
>  	.resource	= jz4740_usb_ohci_resources,
>  };
>  
> -/* UDC (USB gadget controller) */
> -static struct resource jz4740_usb_gdt_resources[] = {
> -	{
> -		.start	= JZ4740_UDC_BASE_ADDR,
> -		.end	= JZ4740_UDC_BASE_ADDR + 0x1000 - 1,
> -		.flags	= IORESOURCE_MEM,
> +/* USB Device Controller */
> +struct platform_device jz4740_udc_xceiv_device = {
> +	.name = "usb_phy_gen_xceiv",
> +	.id   = 0,
> +};
> +
> +static struct resource jz4740_udc_resources[] = {
> +	[0] = {
> +		.start = JZ4740_UDC_BASE_ADDR,
> +		.end   = JZ4740_UDC_BASE_ADDR + 0x10000 - 1,
> +		.flags = IORESOURCE_MEM,
>  	},
> -	{
> -		.start	= JZ4740_IRQ_UDC,
> -		.end	= JZ4740_IRQ_UDC,
> -		.flags	= IORESOURCE_IRQ,
> +	[1] = {
> +		.start = JZ4740_IRQ_UDC,
> +		.end   = JZ4740_IRQ_UDC,
> +		.flags = IORESOURCE_IRQ,
> +		.name  = "mc",
>  	},
>  };
>  
>  struct platform_device jz4740_udc_device = {
> -	.name		= "jz-udc",
> -	.id		= -1,
> -	.dev = {
> -		.dma_mask = &jz4740_udc_device.dev.coherent_dma_mask,
> +	.name = "musb-jz4740",
> +	.id   = -1,
> +	.dev  = {
> +		.dma_mask          = &jz4740_udc_device.dev.coherent_dma_mask,
>  		.coherent_dma_mask = DMA_BIT_MASK(32),
>  	},
> -	.num_resources	= ARRAY_SIZE(jz4740_usb_gdt_resources),
> -	.resource	= jz4740_usb_gdt_resources,
> +	.num_resources = ARRAY_SIZE(jz4740_udc_resources),
> +	.resource      = jz4740_udc_resources,
>  };
>  
>  /* MMC/SD controller */
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/