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>
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
index e59fb97..c853bfa 100644
--- a/arch/arm/plat-mxc/gpio.c
+++ b/arch/arm/plat-mxc/gpio.c
@@ -395,7 +395,7 @@
#endif /* if defined(CONFIG_SOC_IMX21) */
-#if defined(CONFIG_ARCH_MX25)
+#if defined(CONFIG_SOC_IMX25)
static struct mxc_gpio_port imx25_gpio_ports[] = {
DEFINE_IMX_GPIO_PORT_IRQ(MX25, 0, 1, MX25_INT_GPIO1),
DEFINE_IMX_GPIO_PORT_IRQ(MX25, 1, 2, MX25_INT_GPIO2),
@@ -405,7 +405,7 @@
DEFINE_REGISTER_FUNCTION(imx25)
-#endif /* if defined(CONFIG_ARCH_MX25) */
+#endif /* if defined(CONFIG_SOC_IMX25) */
#if defined(CONFIG_SOC_IMX27)
static struct mxc_gpio_port imx27_gpio_ports[] = {