lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: mxc: gadget: remove 60mhz clock requirement for freescale mx51 usb core

Browse Source 
renamed fsl_mx3_udc.c -> fsl_mxc_udc.c
for mx51, usb core is clocked from sources that are not 60mhz.

Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Dinh Nguyen
2010-05-10 11:21:57 -05:00
committed by Greg Kroah-Hartman
parent 166ceb6907
commit 73a0bd77d6
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/gadget/Makefile
View File

@@ -20,7 +20,7 @@ obj-$(CONFIG_USB_ATMEL_USBA) += atmel_usba_udc.o
obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o
fsl_usb2_udc-objs := fsl_udc_core.o fsl_usb2_udc-objs := fsl_udc_core.o
ifeq ($(CONFIG_ARCH_MXC),y) ifeq ($(CONFIG_ARCH_MXC),y)
fsl_usb2_udc-objs += fsl_mx3_udc.o fsl_usb2_udc-objs += fsl_mxc_udc.o
endif endif
obj-$(CONFIG_USB_M66592) += m66592-udc.o obj-$(CONFIG_USB_M66592) += m66592-udc.o
obj-$(CONFIG_USB_R8A66597) += r8a66597-udc.o obj-$(CONFIG_USB_R8A66597) += r8a66597-udc.o

14
drivers/usb/gadget/fsl_mx3_udc.c → drivers/usb/gadget/fsl_mxc_udc.c
View File

@@ -50,12 +50,14 @@ int fsl_udc_clk_init(struct platform_device *pdev)
goto egusb; goto egusb;
} }
freq = clk_get_rate(mxc_usb_clk); if (!cpu_is_mx51()) {
if (pdata->phy_mode != FSL_USB2_PHY_ULPI && freq = clk_get_rate(mxc_usb_clk);
(freq < 59999000 || freq > 60001000)) { if (pdata->phy_mode != FSL_USB2_PHY_ULPI &&
dev_err(&pdev->dev, "USB_CLK=%lu, should be 60MHz\n", freq); (freq < 59999000 || freq > 60001000)) {
ret = -EINVAL; dev_err(&pdev->dev, "USB_CLK=%lu, should be 60MHz\n", freq);
goto eclkrate; ret = -EINVAL;
goto eclkrate;
}
} }
ret = clk_enable(mxc_usb_clk); ret = clk_enable(mxc_usb_clk);