Merge tag 'samsung-clk-s3c64xx' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

From Kukjin Kim:
Common clk support for S3C64XX
- add PLL for S3C64XX
- add s3c64xx clock driver
- update drivers to use CCF of s3c64xx

* tag 'samsung-clk-s3c64xx' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C64XX: Remove old clock management code
  ARM: S3C64XX: Migrate clock handling to Common Clock Framework
  usb: ohci-s3c2410.c: Use clk_prepare_enable/clk_disable_unprepare
  ARM: S3C64XX: Use clk_prepare_enable/clk_disable_unprepare in dma.c
  ARM: SAMSUNG: Add soc_is_s3c6400/s3c6410 macros

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 4919afa4125e..1adff32e40e2 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -47,10 +47,10 @@ static void s3c2410_start_hc(struct platform_device *dev, struct usb_hcd *hcd)
 
         dev_dbg(&dev->dev, "s3c2410_start_hc:\n");
 
-        clk_enable(usb_clk);
+        clk_prepare_enable(usb_clk);
         mdelay(2);                      /* let the bus clock stabilise */
 
-        clk_enable(clk);
+        clk_prepare_enable(clk);
 
         if (info != NULL) {
                 info->hcd       = hcd;
@@ -75,8 +75,8 @@ static void s3c2410_stop_hc(struct platform_device *dev)
                         (info->enable_oc)(info, 0);
         }
 
-        clk_disable(clk);
-        clk_disable(usb_clk);
+        clk_disable_unprepare(clk);
+        clk_disable_unprepare(usb_clk);
 }
 
 /* ohci_s3c2410_hub_status_data