diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-06-01 15:59:07 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-06-01 15:59:07 +0300 |
| commit | 9fd096364296791b3d1fc8827f2694d8eec54e21 (patch) | |
| tree | 0dd6f7aa953fe0dfc502541fdbe8c79a7258ecef /include/linux/mmc/host.h | |
| parent | fb12e0df3039896778718ec0224f5f8c0ac604f9 (diff) | |
| parent | fc0481efeede37c1ccdb2f16bfdc3fe4d9f4c815 (diff) | |
Merge branch 'tracking-linaro-android-llct' into merge-linux-linaro-core-tracking
Diffstat (limited to 'include/linux/mmc/host.h')
| -rw-r--r-- | include/linux/mmc/host.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index b5bedaec6223..a233a53ed4e5 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -370,6 +370,15 @@ struct mmc_host { int dsr_req; /* DSR value is valid */ u32 dsr; /* optional driver stage (DSR) value */ +#ifdef CONFIG_MMC_EMBEDDED_SDIO + struct { + struct sdio_cis *cis; + struct sdio_cccr *cccr; + struct sdio_embedded_func *funcs; + int num_funcs; + } embedded_sdio_data; +#endif + unsigned long private[0] ____cacheline_aligned; }; @@ -379,6 +388,14 @@ void mmc_remove_host(struct mmc_host *); void mmc_free_host(struct mmc_host *); int mmc_of_parse(struct mmc_host *host); +#ifdef CONFIG_MMC_EMBEDDED_SDIO +extern void mmc_set_embedded_sdio_data(struct mmc_host *host, + struct sdio_cis *cis, + struct sdio_cccr *cccr, + struct sdio_embedded_func *funcs, + int num_funcs); +#endif + static inline void *mmc_priv(struct mmc_host *host) { return (void *)host->private; |