diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:34:50 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:34:50 +0000 |
| commit | 677f4f64e4b2336682f0e15c69b206ade6f6b131 (patch) | |
| tree | 83b1f3e1f0de4c569e6c5adcf5e9934e6254f4e6 /arch/arm/mach-mx3/clock-imx35.c | |
| parent | 4567c4a89693416ccca02d32109bce967e9c1ade (diff) | |
| parent | fedea672a3aab3b99d03e69805ee423c73af1961 (diff) | |
| download | kernel_goldelico_gta04-677f4f64e4b2336682f0e15c69b206ade6f6b131.zip kernel_goldelico_gta04-677f4f64e4b2336682f0e15c69b206ade6f6b131.tar.gz kernel_goldelico_gta04-677f4f64e4b2336682f0e15c69b206ade6f6b131.tar.bz2 | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx3/clock-imx35.c')
| -rw-r--r-- | arch/arm/mach-mx3/clock-imx35.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c index 02a9a18..7584b4c 100644 --- a/arch/arm/mach-mx3/clock-imx35.c +++ b/arch/arm/mach-mx3/clock-imx35.c @@ -387,6 +387,8 @@ DEFINE_CLOCK(csi_clk, 0, CCM_CGR3, 0, get_rate_csi, NULL); DEFINE_CLOCK(iim_clk, 0, CCM_CGR3, 2, NULL, NULL); DEFINE_CLOCK(gpu2d_clk, 0, CCM_CGR3, 4, NULL, NULL); +DEFINE_CLOCK(usbahb_clk, 0, 0, 0, get_rate_ahb, NULL); + static int clk_dummy_enable(struct clk *clk) { return 0; @@ -471,6 +473,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc-ehci.1", "usb", usbotg_clk) _REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk) _REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk) + _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usbahb_clk) _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) _REGISTER_CLOCK(NULL, "max", max_clk) _REGISTER_CLOCK(NULL, "audmux", audmux_clk) @@ -485,7 +488,7 @@ int __init mx35_clocks_init() int i; unsigned int ll = 0; -#ifdef CONFIG_DEBUG_LL_CONSOLE +#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC) ll = (3 << 16); #endif |