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>

diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index a55050c17893fc367c46c37957428fe1a59f6c26..9bcde110feb1a3046e93176c2b65ac998f0ebfb7 100644 (file)
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -20,7 +20,7 @@ obj-$(CONFIG_USB_ATMEL_USBA)  += atmel_usba_udc.o
 obj-$(CONFIG_USB_FSL_USB2)     += fsl_usb2_udc.o
 fsl_usb2_udc-objs              := fsl_udc_core.o
 ifeq ($(CONFIG_ARCH_MXC),y)
-fsl_usb2_udc-objs              += fsl_mx3_udc.o
+fsl_usb2_udc-objs              += fsl_mxc_udc.o
 endif
 obj-$(CONFIG_USB_M66592)       += m66592-udc.o
 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
similarity index 89%
rename from drivers/usb/gadget/fsl_mx3_udc.c
rename to drivers/usb/gadget/fsl_mxc_udc.c
index 20a802ecaa158e73dd6c27b009afacc9052b0268..d0b8bde59e59effdff3df5e5d84b5a79a817903d 100644 (file)
--- 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)
                goto egusb;
        }
 
-       freq = clk_get_rate(mxc_usb_clk);
-       if (pdata->phy_mode != FSL_USB2_PHY_ULPI &&
-           (freq < 59999000 || freq > 60001000)) {
-               dev_err(&pdev->dev, "USB_CLK=%lu, should be 60MHz\n", freq);
-               ret = -EINVAL;
-               goto eclkrate;
+       if (!cpu_is_mx51()) {
+               freq = clk_get_rate(mxc_usb_clk);
+               if (pdata->phy_mode != FSL_USB2_PHY_ULPI &&
+                   (freq < 59999000 || freq > 60001000)) {
+                       dev_err(&pdev->dev, "USB_CLK=%lu, should be 60MHz\n", freq);
+                       ret = -EINVAL;
+                       goto eclkrate;
+               }
        }
 
        ret = clk_enable(mxc_usb_clk);