UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM i.MX35 pcm043: put usbh1 outside CONFIG_USB_ULPI 

The usbh1 port of the pcm043 does not use ulpi, so put it outside
the corresponding ifdefs.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2011-01-14 11:19:35 +01:00
parent 0fbfd987ff
commit 070ed73359
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-mx3/mach-pcm043.c
View File

@ -310,13 +310,13 @@ static struct mxc_usbh_platform_data otg_pdata __initdata = {
.portsc = MXC_EHCI_MODE_UTMI, .portsc = MXC_EHCI_MODE_UTMI,
.flags = MXC_EHCI_INTERFACE_DIFF_UNI, .flags = MXC_EHCI_INTERFACE_DIFF_UNI,
}; };
#endif
static const struct mxc_usbh_platform_data usbh1_pdata __initconst = { static const struct mxc_usbh_platform_data usbh1_pdata __initconst = {
.portsc = MXC_EHCI_MODE_SERIAL, .portsc = MXC_EHCI_MODE_SERIAL,
.flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY | .flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY |
MXC_EHCI_IPPUE_DOWN, MXC_EHCI_IPPUE_DOWN,
}; };
#endif
static const struct fsl_usb2_platform_data otg_device_pdata __initconst = { static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
.operating_mode = FSL_USB2_DR_DEVICE, .operating_mode = FSL_USB2_DR_DEVICE,
@ -382,9 +382,9 @@ static void __init mxc_board_init(void)
imx35_add_mxc_ehci_otg(&otg_pdata); imx35_add_mxc_ehci_otg(&otg_pdata);
} }
imx35_add_mxc_ehci_hs(&usbh1_pdata);
#endif #endif
imx35_add_mxc_ehci_hs(&usbh1_pdata);
if (!otg_mode_host) if (!otg_mode_host)
imx35_add_fsl_usb2_udc(&otg_device_pdata); imx35_add_fsl_usb2_udc(&otg_device_pdata);