summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-04-08 16:43:27 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-06-23 13:16:18 +0200
commitd2c7dc13305a12f49a8df192405f6e1b0055915f (patch)
tree52509fc54126155ee10eeca94a4bb3225e099e7c
parentc12a01152bcbe002a1b1e5c22d7627476d406523 (diff)
downloadlinux-2.6-d2c7dc13305a12f49a8df192405f6e1b0055915f.tar.gz
linux-2.6-d2c7dc13305a12f49a8df192405f6e1b0055915f.tar.xz
ehci mxc: Fix clocks for i.MX27
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-mx2/clock_imx27.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c
index f9b85e05e18..80ab3b6973e 100644
--- a/arch/arm/mach-mx2/clock_imx27.c
+++ b/arch/arm/mach-mx2/clock_imx27.c
@@ -581,7 +581,7 @@ DEFINE_CLOCK(csi_clk1, 0, PCCR1, 21, NULL, NULL, &ahb_clk);
DEFINE_CLOCK(brom_clk, 0, PCCR1, 22, NULL, NULL, &ahb_clk);
DEFINE_CLOCK(ata_clk, 0, PCCR1, 23, NULL, NULL, &ahb_clk);
DEFINE_CLOCK(wdog_clk, 0, PCCR1, 24, NULL, NULL, &ipg_clk);
-DEFINE_CLOCK(usb_clk, 0, PCCR1, 25, get_rate_usb, &usb_clk1, &spll_clk);
+DEFINE_CLOCK(usb_clk, 0, PCCR1, 25, get_rate_usb, NULL, &spll_clk);
DEFINE_CLOCK(uart6_clk1, 0, PCCR1, 26, NULL, NULL, &ipg_clk);
DEFINE_CLOCK(uart5_clk1, 0, PCCR1, 27, NULL, NULL, &ipg_clk);
DEFINE_CLOCK(uart4_clk1, 0, PCCR1, 28, NULL, NULL, &ipg_clk);
@@ -641,9 +641,12 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK("spi_imx.2", NULL, cspi3_clk)
_REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)
_REGISTER_CLOCK("mx27-camera.0", NULL, csi_clk)
- _REGISTER_CLOCK("mxc-ehci.0", NULL, usb_clk)
- _REGISTER_CLOCK("mxc-ehci.1", NULL, usb_clk)
- _REGISTER_CLOCK("mxc-ehci.2", NULL, usb_clk)
+ _REGISTER_CLOCK("mxc-ehci.0", "usb", usb_clk)
+ _REGISTER_CLOCK("mxc-ehci.0", "usb_ahb", usb_clk1)
+ _REGISTER_CLOCK("mxc-ehci.1", "usb", usb_clk)
+ _REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", usb_clk1)
+ _REGISTER_CLOCK("mxc-ehci.2", "usb", usb_clk)
+ _REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_clk1)
_REGISTER_CLOCK("mxc-ssi.0", NULL, ssi1_clk)
_REGISTER_CLOCK("mxc-ssi.1", NULL, ssi2_clk)
_REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)