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 | |
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')
-rw-r--r-- | arch/arm/boards/ccxmx51/ccxmx51js.c | 4 | ||||
-rw-r--r-- | arch/arm/boards/chumby_falconwing/falconwing.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/freescale-mx23-evk/mx23-evk.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/freescale-mx28-evk/mx28-evk.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/friendlyarm-mini2440/mini2440.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/karo-tx28/tx28-stk5.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/tqma53/board.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/esdhc.h | 2 |
10 files changed, 11 insertions, 11 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 = { diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index 720fe325d4..cb934ee67a 100644 --- a/arch/arm/boards/chumby_falconwing/falconwing.c +++ b/arch/arm/boards/chumby_falconwing/falconwing.c @@ -32,7 +32,7 @@ #include <mach/usb.h> static struct mxs_mci_platform_data mci_pdata = { - .caps = MMC_MODE_4BIT | MMC_MODE_HS | MMC_MODE_HS_52MHz, + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED, .voltages = MMC_VDD_32_33 | MMC_VDD_33_34, /* fixed to 3.3 V */ }; diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c index a37b0898eb..9054afa855 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c @@ -72,7 +72,7 @@ static const uint32_t cfa10036_pads[] = { }; static struct mxs_mci_platform_data mci_pdata = { - .caps = MMC_MODE_8BIT, + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, .voltages = MMC_VDD_32_33 | MMC_VDD_33_34, /* fixed to 3.3 V */ .f_min = 400 * 1000, .f_max = 25000000, diff --git a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c index 76377b1a36..dddefb2231 100644 --- a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c +++ b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c @@ -28,7 +28,7 @@ #include <mach/usb.h> static struct mxs_mci_platform_data mci_pdata = { - .caps = MMC_MODE_4BIT | MMC_MODE_HS | MMC_MODE_HS_52MHz, + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED, .voltages = MMC_VDD_32_33 | MMC_VDD_33_34, /* fixed to 3.3 V */ .f_min = 400000, }; diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c index 364b6ee23e..bb2dbccaf8 100644 --- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c +++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c @@ -136,7 +136,7 @@ static const uint32_t mx28evk_pads[] = { }; static struct mxs_mci_platform_data mci_pdata = { - .caps = MMC_MODE_8BIT, + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, .voltages = MMC_VDD_32_33 | MMC_VDD_33_34, /* fixed to 3.3 V */ .f_min = 400 * 1000, .f_max = 25000000, diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c index c4b97a2bb8..de07bda755 100644 --- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c +++ b/arch/arm/boards/friendlyarm-mini2440/mini2440.c @@ -62,7 +62,7 @@ static struct dm9000_platform_data dm9000_data = { }; static struct s3c_mci_platform_data mci_data = { - .caps = MMC_MODE_4BIT | MMC_MODE_HS | MMC_MODE_HS_52MHz, + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED, .voltages = MMC_VDD_32_33 | MMC_VDD_33_34, .gpio_detect = 232, /* GPG8_GPIO */ .detect_invert = 0, diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c index 9620e85f9a..116a9ea992 100644 --- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c +++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c @@ -37,7 +37,7 @@ #include <mach/mci.h> static struct mxs_mci_platform_data mci_pdata = { - .caps = MMC_MODE_4BIT | MMC_MODE_HS | MMC_MODE_HS_52MHz, + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED, .voltages = MMC_VDD_32_33 | MMC_VDD_33_34, /* fixed to 3.3 V */ .f_min = 400000, }; diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c index a0109d6b98..8ee8ac2445 100644 --- a/arch/arm/boards/karo-tx28/tx28-stk5.c +++ b/arch/arm/boards/karo-tx28/tx28-stk5.c @@ -30,7 +30,7 @@ #include <mach/ocotp.h> static struct mxs_mci_platform_data mci_pdata = { - .caps = MMC_MODE_4BIT, + .caps = MMC_CAP_4_BIT_DATA, .voltages = MMC_VDD_32_33 | MMC_VDD_33_34, /* fixed to 3.3 V */ .f_min = 400 * 1000, .f_max = 25000000, diff --git a/arch/arm/boards/tqma53/board.c b/arch/arm/boards/tqma53/board.c index 0054a7e93f..19ad37efcf 100644 --- a/arch/arm/boards/tqma53/board.c +++ b/arch/arm/boards/tqma53/board.c @@ -220,7 +220,7 @@ static struct esdhc_platform_data tqma53_sd2_data = { static struct esdhc_platform_data tqma53_sd3_data = { .cd_type = ESDHC_CD_PERMANENT, .wp_type = ESDHC_WP_NONE, - .caps = MMC_MODE_8BIT | MMC_MODE_4BIT, + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, }; static int tqma53_devices_init(void) diff --git a/arch/arm/mach-imx/include/mach/esdhc.h b/arch/arm/mach-imx/include/mach/esdhc.h index 06863c8f1b..add1691c4b 100644 --- a/arch/arm/mach-imx/include/mach/esdhc.h +++ b/arch/arm/mach-imx/include/mach/esdhc.h @@ -32,7 +32,7 @@ enum cd_types { * @cd_gpio: gpio for card_detect interrupt * @wp_type: type of write_protect method (see wp_types enum above) * @cd_type: type of card_detect method (see cd_types enum above) - * @caps: supported bus width capabilities (MMC_MODE_4BIT | MMC_MODE_8BIT) + * @caps: supported bus width capabilities (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA) */ struct esdhc_platform_data { |