aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-11-02 03:49:41 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2009-11-14 04:30:39 -0500
commit4dc7be72b5c9d33669cb2b68d16c7588fb36d8df (patch)
treef9a7df6499014581867d42e374d21467c84b1c77 /arch/arm/mach-mx3
parent9eedbdf1b4216e286bd660322ae5a52f79eee243 (diff)
i.MX35: Fix audmux clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r--arch/arm/mach-mx3/clock-imx35.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c
index 93a172da5910..02a9a18e1189 100644
--- a/arch/arm/mach-mx3/clock-imx35.c
+++ b/arch/arm/mach-mx3/clock-imx35.c
@@ -335,7 +335,7 @@ static void clk_cgr_disable(struct clk *clk)
335 335
336DEFINE_CLOCK(asrc_clk, 0, CCM_CGR0, 0, NULL, NULL); 336DEFINE_CLOCK(asrc_clk, 0, CCM_CGR0, 0, NULL, NULL);
337DEFINE_CLOCK(ata_clk, 0, CCM_CGR0, 2, get_rate_ipg, NULL); 337DEFINE_CLOCK(ata_clk, 0, CCM_CGR0, 2, get_rate_ipg, NULL);
338DEFINE_CLOCK(audmux_clk, 0, CCM_CGR0, 4, NULL, NULL); 338/* DEFINE_CLOCK(audmux_clk, 0, CCM_CGR0, 4, NULL, NULL); */
339DEFINE_CLOCK(can1_clk, 0, CCM_CGR0, 6, get_rate_ipg, NULL); 339DEFINE_CLOCK(can1_clk, 0, CCM_CGR0, 6, get_rate_ipg, NULL);
340DEFINE_CLOCK(can2_clk, 1, CCM_CGR0, 8, get_rate_ipg, NULL); 340DEFINE_CLOCK(can2_clk, 1, CCM_CGR0, 8, get_rate_ipg, NULL);
341DEFINE_CLOCK(cspi1_clk, 0, CCM_CGR0, 10, get_rate_ipg, NULL); 341DEFINE_CLOCK(cspi1_clk, 0, CCM_CGR0, 10, get_rate_ipg, NULL);
@@ -381,7 +381,7 @@ DEFINE_CLOCK(uart3_clk, 2, CCM_CGR2, 20, get_rate_uart, NULL);
381DEFINE_CLOCK(usbotg_clk, 0, CCM_CGR2, 22, get_rate_otg, NULL); 381DEFINE_CLOCK(usbotg_clk, 0, CCM_CGR2, 22, get_rate_otg, NULL);
382DEFINE_CLOCK(wdog_clk, 0, CCM_CGR2, 24, NULL, NULL); 382DEFINE_CLOCK(wdog_clk, 0, CCM_CGR2, 24, NULL, NULL);
383DEFINE_CLOCK(max_clk, 0, CCM_CGR2, 26, NULL, NULL); 383DEFINE_CLOCK(max_clk, 0, CCM_CGR2, 26, NULL, NULL);
384DEFINE_CLOCK(admux_clk, 0, CCM_CGR2, 30, NULL, NULL); 384DEFINE_CLOCK(audmux_clk, 0, CCM_CGR2, 30, NULL, NULL);
385 385
386DEFINE_CLOCK(csi_clk, 0, CCM_CGR3, 0, get_rate_csi, NULL); 386DEFINE_CLOCK(csi_clk, 0, CCM_CGR3, 0, get_rate_csi, NULL);
387DEFINE_CLOCK(iim_clk, 0, CCM_CGR3, 2, NULL, NULL); 387DEFINE_CLOCK(iim_clk, 0, CCM_CGR3, 2, NULL, NULL);
@@ -426,7 +426,6 @@ static struct clk nfc_clk = {
426static struct clk_lookup lookups[] = { 426static struct clk_lookup lookups[] = {
427 _REGISTER_CLOCK(NULL, "asrc", asrc_clk) 427 _REGISTER_CLOCK(NULL, "asrc", asrc_clk)
428 _REGISTER_CLOCK(NULL, "ata", ata_clk) 428 _REGISTER_CLOCK(NULL, "ata", ata_clk)
429 _REGISTER_CLOCK(NULL, "audmux", audmux_clk)
430 _REGISTER_CLOCK(NULL, "can", can1_clk) 429 _REGISTER_CLOCK(NULL, "can", can1_clk)
431 _REGISTER_CLOCK(NULL, "can", can2_clk) 430 _REGISTER_CLOCK(NULL, "can", can2_clk)
432 _REGISTER_CLOCK("spi_imx.0", NULL, cspi1_clk) 431 _REGISTER_CLOCK("spi_imx.0", NULL, cspi1_clk)
@@ -474,7 +473,7 @@ static struct clk_lookup lookups[] = {
474 _REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk) 473 _REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk)
475 _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) 474 _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
476 _REGISTER_CLOCK(NULL, "max", max_clk) 475 _REGISTER_CLOCK(NULL, "max", max_clk)
477 _REGISTER_CLOCK(NULL, "admux", admux_clk) 476 _REGISTER_CLOCK(NULL, "audmux", audmux_clk)
478 _REGISTER_CLOCK(NULL, "csi", csi_clk) 477 _REGISTER_CLOCK(NULL, "csi", csi_clk)
479 _REGISTER_CLOCK(NULL, "iim", iim_clk) 478 _REGISTER_CLOCK(NULL, "iim", iim_clk)
480 _REGISTER_CLOCK(NULL, "gpu2d", gpu2d_clk) 479 _REGISTER_CLOCK(NULL, "gpu2d", gpu2d_clk)