diff options
author | Eric Bénard <eric@eukrea.com> | 2010-06-08 05:03:00 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-26 08:18:13 -0400 |
commit | 8402ed30e16c65ad8560ba3293c7cf9c259712eb (patch) | |
tree | 1a3a2ccde8c6c6f93e4f8fe75fa21d8dccb886cf /arch/arm/plat-mxc/audmux-v2.c | |
parent | 2518507f727e6bf663fd0f276369cbdeb6a0ccc0 (diff) |
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.c | 15 |
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) | |||
191 | { | 191 | { |
192 | int ret; | 192 | int ret; |
193 | 193 | ||
194 | #if defined(CONFIG_ARCH_MX3) | ||
194 | if (cpu_is_mx31()) | 195 | if (cpu_is_mx31()) |
195 | audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR); | 196 | audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR); |
196 | 197 | ||
@@ -204,7 +205,19 @@ static int mxc_audmux_v2_init(void) | |||
204 | } | 205 | } |
205 | audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR); | 206 | audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR); |
206 | } | 207 | } |
207 | 208 | #endif | |
209 | #if defined(CONFIG_ARCH_MX25) | ||
210 | if (cpu_is_mx25()) { | ||
211 | audmux_clk = clk_get(NULL, "audmux"); | ||
212 | if (IS_ERR(audmux_clk)) { | ||
213 | ret = PTR_ERR(audmux_clk); | ||
214 | printk(KERN_ERR "%s: cannot get clock: %d\n", __func__, | ||
215 | ret); | ||
216 | return ret; | ||
217 | } | ||
218 | audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR); | ||
219 | } | ||
220 | #endif | ||
208 | audmux_debugfs_init(); | 221 | audmux_debugfs_init(); |
209 | 222 | ||
210 | return 0; | 223 | return 0; |