diff options
| author | Sascha Hauer | 2010-08-20 16:44:34 +0200 |
|---|---|---|
| committer | Sascha Hauer | 2010-10-01 09:33:01 +0200 |
| commit | 40e2eda92178f58fd7da2866d3f346dcd2baafed (patch) | |
| tree | 4d694e305cfaf516b001f1552f9181d9977f506d /arch/arm | |
| parent | ARM: mx51: add imx-ssi devices (diff) | |
| download | kernel-qcow2-linux-40e2eda92178f58fd7da2866d3f346dcd2baafed.tar.gz kernel-qcow2-linux-40e2eda92178f58fd7da2866d3f346dcd2baafed.tar.xz kernel-qcow2-linux-40e2eda92178f58fd7da2866d3f346dcd2baafed.zip | |
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 default y select MXC_TZIC select ARCH_MXC_IOMUX_V3 + select ARCH_MXC_AUDMUX_V2 comment "MX5 platforms:" 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); static int mxc_audmux_v2_init(void) { int ret; - +#if defined(CONFIG_ARCH_MX5) + if (cpu_is_mx51()) { + audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR); + ret = 0; + return ret; + } +#endif #if defined(CONFIG_ARCH_MX3) if (cpu_is_mx31()) audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR); |