diff options
| author | Seungwon Jeon <tgih.jun@samsung.com> | 2011-12-09 14:55:52 +0900 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-01-11 23:58:44 -0500 |
| commit | 4f408cc67a0613f969d1e02fff6de74d31a29fb3 (patch) | |
| tree | f2e88972eccf39a607245eeabb0e20141f1e4f44 | |
| parent | 6fe8890d0200ea0c2b7d83936d58f97d7ba7c1ff (diff) | |
| download | talos-obmc-linux-4f408cc67a0613f969d1e02fff6de74d31a29fb3.tar.gz talos-obmc-linux-4f408cc67a0613f969d1e02fff6de74d31a29fb3.zip | |
mmc: dw_mmc: Add more capabilities field
This patch adds another capabilities field for MMC_CAPS2_XXX.
Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 6 | ||||
| -rw-r--r-- | include/linux/mmc/dw_mmc.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 44bc11e8761e..69e588960e79 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1681,6 +1681,12 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) else mmc->caps = 0; + if (host->pdata->caps2) + mmc->caps2 = host->pdata->caps2; + else + mmc->caps2 = 0; + + if (host->pdata->get_bus_wd) if (host->pdata->get_bus_wd(slot->id) >= 4) mmc->caps |= MMC_CAP_4_BIT_DATA; diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 6dc9b80568a0..e8779c6d1759 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -214,6 +214,7 @@ struct dw_mci_board { unsigned int bus_hz; /* Bus speed */ unsigned int caps; /* Capabilities */ + unsigned int caps2; /* More capabilities */ /* * Override fifo depth. If 0, autodetect it from the FIFOTH register, * but note that this may not be reliable after a bootloader has used |
