ccxmx53: fix problems with iomux config on SD interfaces

Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com>

2 files changed, 33 insertions, 36 deletions

diff --git a/arch/arm/mach-mx5/board-ccwmx53.h b/arch/arm/mach-mx5/board-ccwmx53.h
index 53dc834b79d0..a07017e8be80 100644
--- a/arch/arm/mach-mx5/board-ccwmx53.h
+++ b/arch/arm/mach-mx5/board-ccwmx53.h
@@ -58,9 +58,6 @@
 
 #endif /* CONFIG_base_board */
 
-#define ESDHC3_WP_PAD		MX53_PAD_NANDF_CS1__NANDF_CS1
-//#define ESDHC3_CD_PAD
-
 #define USER_LED1_PAD		MX53_PAD_CSI0_DATA_EN__GPIO5_20
 #define USER_LED1_GPIO		MX53_GPIO(5, 20)	/* GPIO_5_20 */
 #define USER_LED2_PAD		MX53_PAD_GPIO_17__GPIO7_12
diff --git a/arch/arm/mach-mx5/mx53_ccwmx53js_gpio.c b/arch/arm/mach-mx5/mx53_ccwmx53js_gpio.c
index 78da66b08eb2..54cd008ff859 100644
--- a/arch/arm/mach-mx5/mx53_ccwmx53js_gpio.c
+++ b/arch/arm/mach-mx5/mx53_ccwmx53js_gpio.c
@@ -148,7 +148,7 @@ EXPORT_SYMBOL(gpio_uart_active);
 EXPORT_SYMBOL(gpio_uart_inactive);
 
 
-#if defined(ESDHCI_MXC_SELECT1)
+#if defined(CONFIG_ESDHCI_MXC_SELECT1)
 static iomux_v3_cfg_t ccwmx53_mmc1_pads[] = {
 	MX53_PAD_SD1_CLK__ESDHC1_CLK,
 	MX53_PAD_SD1_CMD__ESDHC1_CMD,
@@ -173,21 +173,21 @@ static iomux_v3_cfg_t ccwmx53_mmc1_pads[] = {
 };
 #endif /* ESDHCI_MXC_SELECT1 */
 
-#ifdef ESDHCI_MXC_SELECT2
+#if defined(CONFIG_ESDHCI_MXC_SELECT2)
 static iomux_v3_cfg_t ccwmx53_mmc2_pads[] = {
-	MX53_PAD_SD2_CLK__SD2_CLK,
-	MX53_PAD_SD2_CMD__SD2_CMD,
-	MX53_PAD_SD2_DATA0__SD2_DAT0,
+	MX53_PAD_SD2_CLK__ESDHC2_CLK,
+	MX53_PAD_SD2_CMD__ESDHC2_CMD,
+	MX53_PAD_SD2_DATA0__ESDHC2_DAT0,
 #if defined(ESDHCI_MXC_SELECT2_8BIT_PORT) || defined(ESDHCI_MXC_SELECT2_4BIT_PORT)
-	MX53_PAD_SD2_DATA1__SD2_DAT1,
-	MX53_PAD_SD2_DATA2__SD2_DAT2,
-	MX53_PAD_SD2_DATA3__SD2_DAT3,
+	MX53_PAD_SD2_DATA1__ESDHC2_DAT1,
+	MX53_PAD_SD2_DATA2__ESDHC2_DAT2,
+	MX53_PAD_SD2_DATA3__ESDHC2_DAT3,
 #endif /* (ESDHCI_MXC_SELECT2_8BIT_PORT) || (ESDHCI_MXC_SELECT2_4BIT_PORT) */
 #ifdef ESDHCI_MXC_SELECT2_8BIT_PORT
-	MX53_PAD_PATA_DATA12__SD2_DAT4,
-	MX53_PAD_PATA_DATA13__SD2_DAT5,
-	MX53_PAD_PATA_DATA14__SD2_DAT6,
-	MX53_PAD_PATA_DATA15__SD2_DAT7,
+	MX53_PAD_PATA_DATA12__ESDHC2_DAT4,
+	MX53_PAD_PATA_DATA13__ESDHC2_DAT5,
+	MX53_PAD_PATA_DATA14__ESDHC2_DAT6,
+	MX53_PAD_PATA_DATA15__ESDHC2_DAT7,
 #endif /* ESDHCI_MXC_SELECT2_8BIT_PORT */
 #ifdef ESDHC2_WP_PAD
 	ESDHC2_WP_PAD,
@@ -198,21 +198,21 @@ static iomux_v3_cfg_t ccwmx53_mmc2_pads[] = {
 };
 #endif /* ESDHCI_MXC_SELECT2 */
 
-#ifdef ESDHCI_MXC_SELECT3
+#if defined(CONFIG_ESDHCI_MXC_SELECT3)
 static iomux_v3_cfg_t ccwmx53_mmc3_pads[] = {
-	MX53_PAD_PATA_IORDY__SD3_CLK,
-	MX53_PAD_PATA_RESET_B__SD3_CMD,
-	MX53_PAD_PATA_DATA8__SD3_DAT0,
+	MX53_PAD_PATA_IORDY__ESDHC3_CLK,
+	MX53_PAD_PATA_RESET_B__ESDHC3_CMD,
+	MX53_PAD_PATA_DATA8__ESDHC3_DAT0,
 #if defined(ESDHCI_MXC_SELECT3_8BIT_PORT) || defined(ESDHCI_MXC_SELECT3_4BIT_PORT)
-	MX53_PAD_PATA_DATA9__SD3_DAT1,
-	MX53_PAD_PATA_DATA10__SD3_DAT2,
-	MX53_PAD_PATA_DATA11__SD3_DAT3,
+	MX53_PAD_PATA_DATA9__ESDHC3_DAT1,
+	MX53_PAD_PATA_DATA10__ESDHC3_DAT2,
+	MX53_PAD_PATA_DATA11__ESDHC3_DAT3,
 #endif /* (ESDHCI_MXC_SELECT3_8BIT_PORT) || (ESDHCI_MXC_SELECT3_4BIT_PORT) */
 #ifdef ESDHCI_MXC_SELECT3_8BIT_PORT
-	MX53_PAD_PATA_DATA0__SD3_DAT4,
-	MX53_PAD_PATA_DATA1__SD3_DAT5,
-	MX53_PAD_PATA_DATA2__SD3_DAT6,
-	MX53_PAD_PATA_DATA3__SD3_DAT7,
+	MX53_PAD_PATA_DATA0__ESDHC3_DAT4,
+	MX53_PAD_PATA_DATA1__ESDHC3_DAT5,
+	MX53_PAD_PATA_DATA2__ESDHC3_DAT6,
+	MX53_PAD_PATA_DATA3__ESDHC3_DAT7,
 #endif /* ESDHCI_MXC_SELECT3_8BIT_PORT */
 #ifdef ESDHC3_WP_PAD
 	ESDHC3_WP_PAD,
@@ -226,30 +226,30 @@ static iomux_v3_cfg_t ccwmx53_mmc3_pads[] = {
 void gpio_sdhc_active(int interface)
 {
 	switch (interface) {
-#if defined(ESDHCI_MXC_SELECT1)
+#if defined(CONFIG_ESDHCI_MXC_SELECT1)
 	case 0:
 		mxc_iomux_v3_setup_multiple_pads(ccwmx53_mmc1_pads,
-						 ARRAY_SIZE(ccwmx51_mmc1_pads));
+						 ARRAY_SIZE(ccwmx53_mmc1_pads));
 		break;
-#endif /* ESDHCI_MXC_SELECT1 */
-#ifdef ESDHCI_MXC_SELECT2
+#endif /* CONFIG_ESDHCI_MXC_SELECT1 */
+#if defined(CONFIG_ESDHCI_MXC_SELECT2)
 	case 1:
 		mxc_iomux_v3_setup_multiple_pads(ccwmx53_mmc2_pads,
-						 ARRAY_SIZE(ccwmx51_mmc2_pads));
+						 ARRAY_SIZE(ccwmx53_mmc2_pads));
 		break;
-#endif /* ESDHCI_MXC_SELECT2 */
-#ifdef ESDHCI_MXC_SELECT3
+#endif /* CONFIG_ESDHCI_MXC_SELECT2 */
+#if defined(CONFIG_ESDHCI_MXC_SELECT3)
 	case 2:
 		mxc_iomux_v3_setup_multiple_pads(ccwmx53_mmc3_pads,
 						 ARRAY_SIZE(ccwmx53_mmc3_pads));
 		break;
-#endif /* ESDHCI_MXC_SELECT3 */
-#ifdef ESDHCI_MXC_SELECT4
+#endif /* CONFIG_ESDHCI_MXC_SELECT2 */
+#if defined(CONFIG_ESDHCI_MXC_SELECT4)
 	case 3:
 		mxc_iomux_v3_setup_multiple_pads(ccwmx53_mmc4_pads,
 						 ARRAY_SIZE(ccwmx53_mmc4_pads));
 		break;
-#endif /* ESDHCI_MXC_SELECT4 */
+#endif /* CONFIG_ESDHCI_MXC_SELECT4 */
 	}
 }
 EXPORT_SYMBOL(gpio_sdhc_active);