Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / arch / arm / mach-mx5 / board-mx51_efikamx.c

diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
index 94e7818..b7946f8 100644 (file)
--- a/arch/arm/mach-mx5/board-mx51_efikamx.c
+++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
@@ -94,15 +94,15 @@ static iomux_v3_cfg_t mx51efikamx_pads[] = {
        MX51_PAD_SD2_DATA3__SD2_DATA3,
 
        /* SD/MMC WP/CD */
-       MX51_PAD_GPIO_1_0__ESDHC1_CD,
-       MX51_PAD_GPIO_1_1__ESDHC1_WP,
-       MX51_PAD_GPIO_1_7__ESDHC2_WP,
-       MX51_PAD_GPIO_1_8__ESDHC2_CD,
+       MX51_PAD_GPIO1_0__SD1_CD,
+       MX51_PAD_GPIO1_1__SD1_WP,
+       MX51_PAD_GPIO1_7__SD2_WP,
+       MX51_PAD_GPIO1_8__SD2_CD,
 
        /* leds */
-       MX51_PAD_CSI1_D9__GPIO_3_13,
-       MX51_PAD_CSI1_VSYNC__GPIO_3_14,
-       MX51_PAD_CSI1_HSYNC__GPIO_3_15,
+       MX51_PAD_CSI1_D9__GPIO3_13,
+       MX51_PAD_CSI1_VSYNC__GPIO3_14,
+       MX51_PAD_CSI1_HSYNC__GPIO3_15,
 
        /* power key */
        MX51_PAD_PWRKEY,
@@ -110,14 +110,14 @@ static iomux_v3_cfg_t mx51efikamx_pads[] = {
        /* spi */
        MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI,
        MX51_PAD_CSPI1_MISO__ECSPI1_MISO,
-       MX51_PAD_CSPI1_SS0__GPIO_4_24,
-       MX51_PAD_CSPI1_SS1__GPIO_4_25,
+       MX51_PAD_CSPI1_SS0__GPIO4_24,
+       MX51_PAD_CSPI1_SS1__GPIO4_25,
        MX51_PAD_CSPI1_RDY__ECSPI1_RDY,
        MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK,
 
        /* reset */
-       MX51_PAD_DI1_PIN13__GPIO_3_2,
-       MX51_PAD_GPIO_1_4__GPIO_1_4,
+       MX51_PAD_DI1_PIN13__GPIO3_2,
+       MX51_PAD_GPIO1_4__GPIO1_4,
 };
 
 /* Serial ports */