From ben@fluff.org.uk Mon Jun 26 15:37:21 2006 Date: Mon, 26 Jun 2006 23:36:07 +0100 From: Ben Dooks Cc: gregkh@suse.de Subject: USB: ohci-s3c2410.c: clock now usb-bus-host Message-ID: <20060626223607.GA1788@home.fluff.org> Content-Disposition: inline With the newer Samsung S3C2412 and S3C2413 SoC devices, the 48MHz USB clock has been given an individual gate into the USB OHCI and gadget blocks. This clock is called usb-bus-clock, and we need to replace the old use of the USB PLL (upll) directly with the new usb-bus-host. The S3C2410 clock driver has been updated already to provide a virtual clock which is a child of the UPLL to maintain compatibility. The S3C2412 clock driver correctly enables the PLL when either usb-bus clock is active. Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/ohci-s3c2410.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- gregkh-2.6.orig/drivers/usb/host/ohci-s3c2410.c +++ gregkh-2.6/drivers/usb/host/ohci-s3c2410.c @@ -370,7 +370,7 @@ static int usb_hcd_s3c2410_probe (const goto err_mem; } - usb_clk = clk_get(&dev->dev, "upll"); + usb_clk = clk_get(&dev->dev, "usb-bus-host"); if (IS_ERR(usb_clk)) { dev_err(&dev->dev, "cannot get usb-host clock\n"); retval = -ENOENT;