ARM: ux500: Set eMMC and WLAN card slot as non-removable

For several reasons, the mmc protocol layer expects devices
being non-removable to use MMC_CAP_NONREMOVABLE, so then we
adapt to this expectation.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 3c07f557914f833aafa8b4994eb6d7628945a2cd..2e341fb4065c4fb33a5a88d28ec07b8843f84c7f 100644 (file)
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -107,7 +107,8 @@ static struct stedma40_chan_cfg sdi1_dma_cfg_tx = {
 struct mmci_platform_data mop500_sdi1_data = {
        .ocr_mask       = MMC_VDD_29_30,
        .f_max          = 100000000,
-       .capabilities   = MMC_CAP_4_BIT_DATA,
+       .capabilities   = MMC_CAP_4_BIT_DATA |
+                               MMC_CAP_NONREMOVABLE,
        .gpio_cd        = -1,
        .gpio_wp        = -1,
 #ifdef CONFIG_STE_DMA40
@@ -146,6 +147,7 @@ struct mmci_platform_data mop500_sdi2_data = {
        .f_max          = 100000000,
        .capabilities   = MMC_CAP_4_BIT_DATA |
                                MMC_CAP_8_BIT_DATA |
+                               MMC_CAP_NONREMOVABLE |
                                MMC_CAP_MMC_HIGHSPEED |
                                MMC_CAP_ERASE |
                                MMC_CAP_CMD23,
@@ -186,6 +188,7 @@ struct mmci_platform_data mop500_sdi4_data = {
        .f_max          = 100000000,
        .capabilities   = MMC_CAP_4_BIT_DATA |
                                MMC_CAP_8_BIT_DATA |
+                               MMC_CAP_NONREMOVABLE |
                                MMC_CAP_MMC_HIGHSPEED |
                                MMC_CAP_ERASE |
                                MMC_CAP_CMD23,