diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-20 10:44:34 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-01 03:33:01 -0400 |
commit | 40e2eda92178f58fd7da2866d3f346dcd2baafed (patch) | |
tree | 4d694e305cfaf516b001f1552f9181d9977f506d /arch/arm | |
parent | b86186610f639344a7db54da89267f645afc30ec (diff) |
ARM: mx51: Add audmux support
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-mx5/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/audmux-v2.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index 65bf34e1a4f6..3a4c3b32a6e7 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig | |||
@@ -5,6 +5,7 @@ config ARCH_MX51 | |||
5 | default y | 5 | default y |
6 | select MXC_TZIC | 6 | select MXC_TZIC |
7 | select ARCH_MXC_IOMUX_V3 | 7 | select ARCH_MXC_IOMUX_V3 |
8 | select ARCH_MXC_AUDMUX_V2 | ||
8 | 9 | ||
9 | comment "MX5 platforms:" | 10 | comment "MX5 platforms:" |
10 | 11 | ||
diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c index f9e7cdbd0005..62920490c0d6 100644 --- a/arch/arm/plat-mxc/audmux-v2.c +++ b/arch/arm/plat-mxc/audmux-v2.c | |||
@@ -186,7 +186,13 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port); | |||
186 | static int mxc_audmux_v2_init(void) | 186 | static int mxc_audmux_v2_init(void) |
187 | { | 187 | { |
188 | int ret; | 188 | int ret; |
189 | 189 | #if defined(CONFIG_ARCH_MX5) | |
190 | if (cpu_is_mx51()) { | ||
191 | audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR); | ||
192 | ret = 0; | ||
193 | return ret; | ||
194 | } | ||
195 | #endif | ||
190 | #if defined(CONFIG_ARCH_MX3) | 196 | #if defined(CONFIG_ARCH_MX3) |
191 | if (cpu_is_mx31()) | 197 | if (cpu_is_mx31()) |
192 | audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR); | 198 | audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR); |