diff options
author | Dinh Nguyen <Dinh.Nguyen@freescale.com> | 2010-05-10 12:21:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:44 -0400 |
commit | 73a0bd77d60163d8b4639834119a1ed65155c062 (patch) | |
tree | 3551eb7a3fa53292d4ead92c3da15c12965ee528 | |
parent | 166ceb69075066cba196434482370f1e0318bc3e (diff) |
USB: mxc: gadget: remove 60mhz clock requirement for freescale mx51 usb core
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>
-rw-r--r-- | drivers/usb/gadget/Makefile | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/fsl_mxc_udc.c (renamed from drivers/usb/gadget/fsl_mx3_udc.c) | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index a55050c17893..9bcde110feb1 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile | |||
@@ -20,7 +20,7 @@ obj-$(CONFIG_USB_ATMEL_USBA) += atmel_usba_udc.o | |||
20 | obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o | 20 | obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o |
21 | fsl_usb2_udc-objs := fsl_udc_core.o | 21 | fsl_usb2_udc-objs := fsl_udc_core.o |
22 | ifeq ($(CONFIG_ARCH_MXC),y) | 22 | ifeq ($(CONFIG_ARCH_MXC),y) |
23 | fsl_usb2_udc-objs += fsl_mx3_udc.o | 23 | fsl_usb2_udc-objs += fsl_mxc_udc.o |
24 | endif | 24 | endif |
25 | obj-$(CONFIG_USB_M66592) += m66592-udc.o | 25 | obj-$(CONFIG_USB_M66592) += m66592-udc.o |
26 | obj-$(CONFIG_USB_R8A66597) += r8a66597-udc.o | 26 | obj-$(CONFIG_USB_R8A66597) += r8a66597-udc.o |
diff --git a/drivers/usb/gadget/fsl_mx3_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c index 20a802ecaa15..d0b8bde59e59 100644 --- a/drivers/usb/gadget/fsl_mx3_udc.c +++ b/drivers/usb/gadget/fsl_mxc_udc.c | |||
@@ -50,12 +50,14 @@ int fsl_udc_clk_init(struct platform_device *pdev) | |||
50 | goto egusb; | 50 | goto egusb; |
51 | } | 51 | } |
52 | 52 | ||
53 | freq = clk_get_rate(mxc_usb_clk); | 53 | if (!cpu_is_mx51()) { |
54 | if (pdata->phy_mode != FSL_USB2_PHY_ULPI && | 54 | freq = clk_get_rate(mxc_usb_clk); |
55 | (freq < 59999000 || freq > 60001000)) { | 55 | if (pdata->phy_mode != FSL_USB2_PHY_ULPI && |
56 | dev_err(&pdev->dev, "USB_CLK=%lu, should be 60MHz\n", freq); | 56 | (freq < 59999000 || freq > 60001000)) { |
57 | ret = -EINVAL; | 57 | dev_err(&pdev->dev, "USB_CLK=%lu, should be 60MHz\n", freq); |
58 | goto eclkrate; | 58 | ret = -EINVAL; |
59 | goto eclkrate; | ||
60 | } | ||
59 | } | 61 | } |
60 | 62 | ||
61 | ret = clk_enable(mxc_usb_clk); | 63 | ret = clk_enable(mxc_usb_clk); |