[PATCH v2 2/3] DA8xx: MUSB platform device registration

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[PATCH v2 2/3] DA8xx: MUSB platform device registration

Kevin Hilman
Sergei Shtylyov <[hidden email]> writes:

> Add the function to register the MUSB platform device.
>
> Signed-off-by: Sergei Shtylyov <[hidden email]>

Thanks, applying to davinci-next.

Kevin

> ---
> The patch is against the recent DaVinci tree.  Tested on DA830 EVM.
>
> Changes since the previos version:
> - moved the code/data from devices-da8xx.c to usb.c, using the already
>   existing platform device...
>
>  arch/arm/mach-davinci/include/mach/da8xx.h |    1
>  arch/arm/mach-davinci/usb.c                |   34 +++++++++++++++++++++++++++++
>  2 files changed, 35 insertions(+)
>
> Index: linux-davinci/arch/arm/mach-davinci/include/mach/da8xx.h
> ===================================================================
> --- linux-davinci.orig/arch/arm/mach-davinci/include/mach/da8xx.h
> +++ linux-davinci/arch/arm/mach-davinci/include/mach/da8xx.h
> @@ -82,6 +82,7 @@ int da8xx_cppi41_init(void);
>  int da8xx_register_edma(void);
>  int da8xx_register_i2c(int instance, struct davinci_i2c_platform_data *pdata);
>  int da8xx_register_watchdog(void);
> +int da8xx_register_usb20(unsigned mA, unsigned potpgt);
>  int da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata);
>  int da8xx_register_emac(void);
>  int da8xx_register_lcdc(struct da8xx_lcdc_platform_data *pdata);
> Index: linux-davinci/arch/arm/mach-davinci/usb.c
> ===================================================================
> --- linux-davinci.orig/arch/arm/mach-davinci/usb.c
> +++ linux-davinci/arch/arm/mach-davinci/usb.c
> @@ -13,6 +13,8 @@
>  #include <mach/usb.h>
>  
>  #define DAVINCI_USB_OTG_BASE 0x01c64000
> +
> +#define DA8XX_USB0_BASE 0x01e00000
>  #define DA8XX_USB1_BASE 0x01e25000
>  
>  #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
> @@ -98,12 +100,44 @@ void __init davinci_setup_usb(unsigned m
>   platform_device_register(&usb_dev);
>  }
>  
> +#ifdef CONFIG_ARCH_DAVINCI_DA8XX
> +static struct resource da8xx_usb20_resources[] = {
> + {
> + .start = DA8XX_USB0_BASE,
> + .end = DA8XX_USB0_BASE + SZ_64K - 1,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = IRQ_DA8XX_USB_INT,
> + .flags = IORESOURCE_IRQ,
> + },
> +};
> +
> +int __init da8xx_register_usb20(unsigned mA, unsigned potpgt)
> +{
> + usb_data.clock  = "usb20";
> + usb_data.power = mA > 510 ? 255 : mA / 2;
> + usb_data.potpgt = (potpgt + 1) / 2;
> +
> + usb_dev.resource = da8xx_usb20_resources;
> + usb_dev.num_resources = ARRAY_SIZE(da8xx_usb20_resources);
> +
> + return platform_device_register(&usb_dev);
> +}
> +#endif /* CONFIG_DAVINCI_DA8XX */
> +
>  #else
>  
>  void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms)
>  {
>  }
>  
> +#ifdef CONFIG_ARCH_DAVINCI_DA8XX
> +int __init da8xx_register_usb20(unsigned mA, unsigned potpgt)
> +{
> +}
> +#endif
> +
>  #endif  /* CONFIG_USB_MUSB_HDRC */
>  
>  #ifdef CONFIG_ARCH_DAVINCI_DA8XX
>
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> [hidden email]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source