diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-11 12:35:01 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-19 15:54:34 -0500 |
commit | 972cc48207450ce6aeed416ac176fe4d0482a4a3 (patch) | |
tree | e62a038b396da09b3f3dd5bdf427eb4baa8772da /arch/arm/plat-mxc/audmux-v2.c | |
parent | 36a8cac9524bc67df2911cb3fbc349f87bcad37d (diff) |
ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC
Some usages of ARCH_MX25 are assuming that if it is
defined the other SoCs are undefined. Use SOC_IMX25 for the save
places.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/audmux-v2.c')
-rw-r--r-- | arch/arm/plat-mxc/audmux-v2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c index 0be1ac7f421b..175e3647bb27 100644 --- a/arch/arm/plat-mxc/audmux-v2.c +++ b/arch/arm/plat-mxc/audmux-v2.c | |||
@@ -209,7 +209,7 @@ static int mxc_audmux_v2_init(void) | |||
209 | audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR); | 209 | audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR); |
210 | } | 210 | } |
211 | #endif | 211 | #endif |
212 | #if defined(CONFIG_ARCH_MX25) | 212 | #if defined(CONFIG_SOC_IMX25) |
213 | if (cpu_is_mx25()) { | 213 | if (cpu_is_mx25()) { |
214 | audmux_clk = clk_get(NULL, "audmux"); | 214 | audmux_clk = clk_get(NULL, "audmux"); |
215 | if (IS_ERR(audmux_clk)) { | 215 | if (IS_ERR(audmux_clk)) { |
@@ -220,7 +220,7 @@ static int mxc_audmux_v2_init(void) | |||
220 | } | 220 | } |
221 | audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR); | 221 | audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR); |
222 | } | 222 | } |
223 | #endif | 223 | #endif /* if defined(CONFIG_SOC_IMX25) */ |
224 | audmux_debugfs_init(); | 224 | audmux_debugfs_init(); |
225 | 225 | ||
226 | return 0; | 226 | return 0; |