diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:35 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:35 +0200 |
| commit | be1ebac4291ddbc6920e63d18ab92292528d1683 (patch) | |
| tree | 52eb678d4f602e94a5e8381e69b35f0827c32f8e /arch/arm/boards/ccxmx51 | |
| parent | 35faccbb1c7919a55cf56e5f403d9f697abaa0cf (diff) | |
| parent | dee6282fbfc974c4103895d1ccb1cffb3c0a3412 (diff) | |
| download | barebox-be1ebac4291ddbc6920e63d18ab92292528d1683.tar.gz barebox-be1ebac4291ddbc6920e63d18ab92292528d1683.tar.xz | |
Merge branch 'for-next/mci'
Conflicts:
arch/arm/boards/ccxmx51/ccxmx51js.c
arch/arm/boards/dmo-mx6-realq7/board.c
Diffstat (limited to 'arch/arm/boards/ccxmx51')
| -rw-r--r-- | arch/arm/boards/ccxmx51/ccxmx51js.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boards/ccxmx51/ccxmx51js.c b/arch/arm/boards/ccxmx51/ccxmx51js.c index 1cf7d53ca5..3bd50ac369 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51js.c +++ b/arch/arm/boards/ccxmx51/ccxmx51js.c @@ -69,14 +69,14 @@ static iomux_v3_cfg_t ccxmx51js_pads[] = { static struct esdhc_platform_data sdhc1_pdata = { .cd_type = ESDHC_CD_NONE, .wp_type = ESDHC_WP_NONE, - .caps = MMC_MODE_4BIT, + .caps = MMC_CAP_4_BIT_DATA, }; static struct esdhc_platform_data sdhc3_pdata = { .cd_type = ESDHC_CD_NONE, .wp_type = ESDHC_WP_GPIO, .wp_gpio = CCXMX51JS_SD3_WP, - .caps = MMC_MODE_4BIT | MMC_MODE_8BIT, + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, }; static struct imxusb_platformdata ccxmx51js_usbhost1_pdata = { |