Loading drivers/usb/gadget/fsl_mx3_udc.c +20 −11 Original line number Diff line number Diff line Loading @@ -17,6 +17,8 @@ #include <linux/fsl_devices.h> #include <linux/platform_device.h> #include <mach/hardware.h> static struct clk *mxc_ahb_clk; static struct clk *mxc_usb_clk; Loading @@ -28,6 +30,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) pdata = pdev->dev.platform_data; if (!cpu_is_mx35()) { mxc_ahb_clk = clk_get(&pdev->dev, "usb_ahb"); if (IS_ERR(mxc_ahb_clk)) return PTR_ERR(mxc_ahb_clk); Loading @@ -37,6 +40,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) dev_err(&pdev->dev, "clk_enable(\"usb_ahb\") failed\n"); goto eenahb; } } /* make sure USB_CLK is running at 60 MHz +/- 1000 Hz */ mxc_usb_clk = clk_get(&pdev->dev, "usb"); Loading @@ -50,6 +54,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) 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; } Loading @@ -66,8 +71,10 @@ int fsl_udc_clk_init(struct platform_device *pdev) clk_put(mxc_usb_clk); mxc_usb_clk = NULL; egusb: if (!cpu_is_mx35()) clk_disable(mxc_ahb_clk); eenahb: if (!cpu_is_mx35()) clk_put(mxc_ahb_clk); return ret; } Loading @@ -90,6 +97,8 @@ void fsl_udc_clk_release(void) clk_disable(mxc_usb_clk); clk_put(mxc_usb_clk); } if (!cpu_is_mx35()) { clk_disable(mxc_ahb_clk); clk_put(mxc_ahb_clk); } } Loading
drivers/usb/gadget/fsl_mx3_udc.c +20 −11 Original line number Diff line number Diff line Loading @@ -17,6 +17,8 @@ #include <linux/fsl_devices.h> #include <linux/platform_device.h> #include <mach/hardware.h> static struct clk *mxc_ahb_clk; static struct clk *mxc_usb_clk; Loading @@ -28,6 +30,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) pdata = pdev->dev.platform_data; if (!cpu_is_mx35()) { mxc_ahb_clk = clk_get(&pdev->dev, "usb_ahb"); if (IS_ERR(mxc_ahb_clk)) return PTR_ERR(mxc_ahb_clk); Loading @@ -37,6 +40,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) dev_err(&pdev->dev, "clk_enable(\"usb_ahb\") failed\n"); goto eenahb; } } /* make sure USB_CLK is running at 60 MHz +/- 1000 Hz */ mxc_usb_clk = clk_get(&pdev->dev, "usb"); Loading @@ -50,6 +54,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) 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; } Loading @@ -66,8 +71,10 @@ int fsl_udc_clk_init(struct platform_device *pdev) clk_put(mxc_usb_clk); mxc_usb_clk = NULL; egusb: if (!cpu_is_mx35()) clk_disable(mxc_ahb_clk); eenahb: if (!cpu_is_mx35()) clk_put(mxc_ahb_clk); return ret; } Loading @@ -90,6 +97,8 @@ void fsl_udc_clk_release(void) clk_disable(mxc_usb_clk); clk_put(mxc_usb_clk); } if (!cpu_is_mx35()) { clk_disable(mxc_ahb_clk); clk_put(mxc_ahb_clk); } }