diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-04-02 12:28:33 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-04-02 12:28:33 +0200 |
| commit | 26a3b58b789bfe94c87e4a49f0f0a16c63dbfb61 (patch) | |
| tree | c33ce991fd679e208e034ca862cbe9f9019cf96d | |
| parent | 0075523aa35d2a84fa7190366f4e5729aeefb08b (diff) | |
board-apalis_imx6: cleanup mmc platform data
| -rw-r--r-- | arch/arm/mach-mx6/board-apalis_imx6.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-mx6/board-apalis_imx6.c b/arch/arm/mach-mx6/board-apalis_imx6.c index 0d343c39b528..752c99d194f9 100644 --- a/arch/arm/mach-mx6/board-apalis_imx6.c +++ b/arch/arm/mach-mx6/board-apalis_imx6.c @@ -81,9 +81,9 @@ #include "cpu_op-mx6.h" #define GP_SD1_CD IMX_GPIO_NR(4, 20) /* Apalis MMC1 */ -#define GP_SD1_WP (-1) +#define GP_SD1_WP (-EINVAL) #define GP_SD2_CD IMX_GPIO_NR(6, 14) /* Apalis SD1 */ -#define GP_SD2_WP (-1) +#define GP_SD2_WP (-EINVAL) #define GP_ECSPI1_CS1 IMX_GPIO_NR(5, 25) /* TODO use SPI HW CS instead of GPIOs?*/ #define GP_ECSPI2_CS1 IMX_GPIO_NR(2, 26) #define GP_USB_OTG_PWR IMX_GPIO_NR(3, 22) @@ -189,8 +189,9 @@ static int plt_sd_pad_change(unsigned int index, int clock) /* Apalis eMMC */ static struct esdhc_platform_data sd3_data = { .always_present = 1, - .cd_gpio = -1, - .wp_gpio = -1, + .cd_gpio = -EINVAL, + .wp_gpio = -EINVAL, + .cd_type = ESDHC_CD_PERMANENT, .support_8bit = 1, .keep_power_at_suspend = 1, .platform_pad_change = plt_sd_pad_change, @@ -200,6 +201,7 @@ static struct esdhc_platform_data sd3_data = { static const struct esdhc_platform_data sd1_data __initconst = { .cd_gpio = GP_SD1_CD, .wp_gpio = GP_SD1_WP, + .cd_type = ESDHC_CD_GPIO, .support_8bit = 1, .keep_power_at_suspend = 1, .platform_pad_change = plt_sd_pad_change, @@ -209,6 +211,7 @@ static const struct esdhc_platform_data sd1_data __initconst = { static const struct esdhc_platform_data sd2_data __initconst = { .cd_gpio = GP_SD2_CD, .wp_gpio = GP_SD2_WP, + .cd_type = ESDHC_CD_GPIO, .keep_power_at_suspend = 1, .platform_pad_change = plt_sd_pad_change, }; |