diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:28:20 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:28:20 +0100 |
| commit | 4b1430b653d73635ffbd6ac45e39fad891b2d9e2 (patch) | |
| tree | 84678671ca24b954833418493c043437f4c67302 /include | |
| parent | 24f1c994cc7ae61e3eee1b34b114315833a4186f (diff) | |
| parent | 9d0ff0aa79ccc40820ce5f581733df08b74e5800 (diff) | |
| download | barebox-4b1430b653d73635ffbd6ac45e39fad891b2d9e2.tar.gz barebox-4b1430b653d73635ffbd6ac45e39fad891b2d9e2.tar.xz | |
Merge branch 'for-next/mmc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/mci.h | 2 | ||||
| -rw-r--r-- | include/platform_data/dw_mmc.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/mci.h b/include/mci.h index 41a757e6de..174d15022a 100644 --- a/include/mci.h +++ b/include/mci.h @@ -56,6 +56,8 @@ #define MMC_CAP_SD_HIGHSPEED (1 << 3) #define MMC_CAP_MMC_HIGHSPEED (1 << 4) #define MMC_CAP_MMC_HIGHSPEED_52MHZ (1 << 5) +/* Mask of all caps for bus width */ +#define MMC_CAP_BIT_DATA_MASK (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA) #define SD_DATA_4BIT 0x00040000 diff --git a/include/platform_data/dw_mmc.h b/include/platform_data/dw_mmc.h index 48faa76c63..4325a4f483 100644 --- a/include/platform_data/dw_mmc.h +++ b/include/platform_data/dw_mmc.h @@ -2,7 +2,7 @@ #define __INCLUDE_PLATFORM_DATA_DW_MMC_H struct dw_mmc_platform_data { - char *devname; + unsigned int bus_width_caps; int ciu_div; }; |