DA8xx: MUSB platform device registration (b0ea26e1) · Commits · 戴 / test

arch/arm/mach-davinci/include/mach/da8xx.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ void __init da850_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);

+35 −0

Original line number	Diff line number	Diff line
		@@ -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,45 @@ void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms)
		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)
		{
		return 0;
		}
		#endif

		#endif /* CONFIG_USB_MUSB_HDRC */

		#ifdef CONFIG_ARCH_DAVINCI_DA8XX