bcm2835-mmc: Don't overwrite MMC capabilities from DT

raspberrypi · Sep 14, 2015 · a137fc7 · a137fc7
1 parent 5893b0b
commit a137fc7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c
@@ -1327,8 +1327,9 @@ static int bcm2835_mmc_add_host(struct bcm2835_host *host)
 	mmc->max_busy_timeout = (1 << 27) / host->timeout_clk;
 #endif
 	/* host controller capabilities */
-	mmc->caps = MMC_CAP_CMD23 | MMC_CAP_ERASE | MMC_CAP_NEEDS_POLL | MMC_CAP_SDIO_IRQ |
-	MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_4_BIT_DATA;
+	mmc->caps |= MMC_CAP_CMD23 | MMC_CAP_ERASE | MMC_CAP_NEEDS_POLL |
+		MMC_CAP_SDIO_IRQ | MMC_CAP_SD_HIGHSPEED |
+		MMC_CAP_MMC_HIGHSPEED | MMC_CAP_4_BIT_DATA;
 
 	host->flags = SDHCI_AUTO_CMD23;