evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM i.MX audmux v2: remove unnecessary ifdefs

Browse source 
These were present to be able to compile this file on different
SoCs. They are not needed anymore.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2011-08-23 21:24:57 +02:00
parent db1ef2b614
commit 56c6b8721f
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/arm/plat-mxc/audmux-v2.c
View file

@ -187,18 +187,11 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port);
static int mxc_audmux_v2_init(void) static int mxc_audmux_v2_init(void)
{ {
int ret; int ret;
#if defined(CONFIG_ARCH_MX5)
if (cpu_is_mx51()) { if (cpu_is_mx51()) {
audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR); audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR);
ret = 0; } else if (cpu_is_mx31()) {
return ret;
}
#endif
#if defined(CONFIG_ARCH_MX3)
if (cpu_is_mx31())
audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR); audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR);
} else if (cpu_is_mx35()) {
else if (cpu_is_mx35()) {
audmux_clk = clk_get(NULL, "audmux"); audmux_clk = clk_get(NULL, "audmux");
if (IS_ERR(audmux_clk)) { if (IS_ERR(audmux_clk)) {
ret = PTR_ERR(audmux_clk); ret = PTR_ERR(audmux_clk);
@ -207,10 +200,7 @@ static int mxc_audmux_v2_init(void)
return ret; return ret;
} }
audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR); audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR);
} } else if (cpu_is_mx25()) {
#endif
#if defined(CONFIG_SOC_IMX25)
if (cpu_is_mx25()) {
audmux_clk = clk_get(NULL, "audmux"); audmux_clk = clk_get(NULL, "audmux");
if (IS_ERR(audmux_clk)) { if (IS_ERR(audmux_clk)) {
ret = PTR_ERR(audmux_clk); ret = PTR_ERR(audmux_clk);
@ -220,7 +210,7 @@ static int mxc_audmux_v2_init(void)
} }
audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR); audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR);
} }
#endif /* if defined(CONFIG_SOC_IMX25) */
audmux_debugfs_init(); audmux_debugfs_init();
return 0; return 0;