summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/audmux-v2.c
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-06-08 11:03:00 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-07-26 14:18:13 +0200
commit8402ed30e16c65ad8560ba3293c7cf9c259712eb (patch)
tree1a3a2ccde8c6c6f93e4f8fe75fa21d8dccb886cf /arch/arm/plat-mxc/audmux-v2.c
parent2518507f727e6bf663fd0f276369cbdeb6a0ccc0 (diff)
downloadlinux-8402ed30e16c65ad8560ba3293c7cf9c259712eb.tar.bz2
i.MX25: add AUDMUX and SSI support
* add clocks for audmux and ssi 1 & 2 * add irq for ssi 1 & 2 * add devices platform for ssi1 & 2 * update audmux-v2 for i.MX25 * add base addresses for audmux & ssi 1 & 2 * add iomux configuration for GPIO for AUD5 port Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/audmux-v2.c')
-rw-r--r--arch/arm/plat-mxc/audmux-v2.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c
index 0c2cc5cd4d83..ab94d78a927f 100644
--- a/arch/arm/plat-mxc/audmux-v2.c
+++ b/arch/arm/plat-mxc/audmux-v2.c
@@ -191,6 +191,7 @@ static int mxc_audmux_v2_init(void)
{
int ret;
+#if defined(CONFIG_ARCH_MX3)
if (cpu_is_mx31())
audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR);
@@ -204,7 +205,19 @@ static int mxc_audmux_v2_init(void)
}
audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR);
}
-
+#endif
+#if defined(CONFIG_ARCH_MX25)
+ if (cpu_is_mx25()) {
+ audmux_clk = clk_get(NULL, "audmux");
+ if (IS_ERR(audmux_clk)) {
+ ret = PTR_ERR(audmux_clk);
+ printk(KERN_ERR "%s: cannot get clock: %d\n", __func__,
+ ret);
+ return ret;
+ }
+ audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR);
+ }
+#endif
audmux_debugfs_init();
return 0;