From: make shi Date: Thu, 8 Nov 2012 07:23:33 +0000 (+0800) Subject: ENGR00233051-02 Mx6 USB: msl headfile for OTG modulization X-Git-Tag: v3.0.35-fsl~261 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=42edd4414449c8b2a7cef390ee88b41e40a59f26;p=karo-tx-linux.git ENGR00233051-02 Mx6 USB: msl headfile for OTG modulization MSL headfile part change -Add and remove some function define in usb.h Signed-off-by: make shi --- diff --git a/arch/arm/mach-mx6/usb.h b/arch/arm/mach-mx6/usb.h index f796e7dad87c..b57104b03fff 100644 --- a/arch/arm/mach-mx6/usb.h +++ b/arch/arm/mach-mx6/usb.h @@ -27,8 +27,6 @@ extern int fsl_usb_host_init(struct platform_device *pdev); extern void fsl_usb_host_uninit(struct fsl_usb2_platform_data *pdata); extern int gpio_usbotg_utmi_active(void); extern void gpio_usbotg_utmi_inactive(void); - -extern void __init mx6_usb_dr_init(void); extern bool usb_icbug_swfix_need(void); extern void __init mx6_usb_h2_init(void); extern void __init mx6_usb_h3_init(void); @@ -38,7 +36,8 @@ extern void mx6_set_host3_vbus_func(driver_vbus_func); extern void mx6_set_host2_vbus_func(driver_vbus_func); extern void mx6_set_host1_vbus_func(driver_vbus_func); extern void mx6_set_otghost_vbus_func(driver_vbus_func); -extern void mx6_set_usb_host1_vbus_func(driver_vbus_func *driver_vbus); +extern void mx6_get_otghost_vbus_func(driver_vbus_func *driver_vbus); +extern void mx6_get_host1_vbus_func(driver_vbus_func *driver_vbus); extern struct platform_device anatop_thermal_device; extern struct platform_device mxc_usbdr_otg_device; extern struct platform_device mxc_usbdr_udc_device; @@ -73,3 +72,13 @@ extern void __iomem *imx_otg_base; .iobase = soc ## _USB_ ## hs ## _BASE_ADDR, \ .irq = soc ## _INT_USB_ ## hs, \ } +#define imx_fsl_usb2_otg_data_entry_single(soc) \ + { \ + .iobase = soc ## _USB_OTG_BASE_ADDR, \ + .irq = soc ## _INT_USB_OTG, \ + } +#define imx_fsl_usb2_udc_data_entry_single(soc) \ + { \ + .iobase = soc ## _USB_OTG_BASE_ADDR, \ + .irq = soc ## _INT_USB_OTG, \ + }