Merge branches 'acpi-battery', 'acpi-video' and 'acpi-misc'

[sfrench/cifs-2.6.git] / drivers / mmc / host / of_mmc_spi.c

diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
index 3629550528b6164e1e73c0efe52382e3e0d04cdb..bf54776fb26cea35f811300633b4e1af70e4c1e2 100644 (file)
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
@@ -70,6 +70,10 @@ struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi)
        } else {
                oms->pdata.caps |= MMC_CAP_NEEDS_POLL;
        }
+       if (device_property_read_bool(dev, "cap-sd-highspeed"))
+               oms->pdata.caps |= MMC_CAP_SD_HIGHSPEED;
+       if (device_property_read_bool(dev, "cap-mmc-highspeed"))
+               oms->pdata.caps |= MMC_CAP_MMC_HIGHSPEED;
 
        dev->platform_data = &oms->pdata;
        return dev->platform_data;