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>

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 44bc11e8761e5049ea154aa764e5992182b209ee..69e588960e79b63c0942a5d1c6959a2f585504ff 100644 (file)
--- 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 6dc9b80568a0d7766d6b8e447ca19b9dbd1d802c..e8779c6d175923172a9f2d00e7213b9305fd1e4b 100644 (file)
--- 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