Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33ff7ddd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: core: prefer SDR50 mode over DDR50 for SD card" into msm-4.9

parents fc5d79f9 21b76618

drivers/mmc/core/sd.c

+8 −8
Original line number Diff line number Diff line
@@ -433,15 +433,15 @@ static void sd_update_bus_speed_mode(struct mmc_card *card) 
	    (card->sw_caps.sd3_bus_mode & SD_MODE_UHS_SDR104) &&

	    (card->host->f_max > UHS_SDR104_MIN_DTR)) {

		card->sd_bus_speed = UHS_SDR104_BUS_SPEED;

	} else if ((card->host->caps & MMC_CAP_UHS_DDR50) &&

		   (card->sw_caps.sd3_bus_mode & SD_MODE_UHS_DDR50) &&

		    (card->host->f_max > UHS_DDR50_MIN_DTR)) {

			card->sd_bus_speed = UHS_DDR50_BUS_SPEED;

	} else if ((card->host->caps & (MMC_CAP_UHS_SDR104 |

		    MMC_CAP_UHS_SDR50)) && (card->sw_caps.sd3_bus_mode &

		    SD_MODE_UHS_SDR50) &&

		    (card->host->f_max > UHS_SDR50_MIN_DTR)) {

		card->sd_bus_speed = UHS_SDR50_BUS_SPEED;

	} else if ((card->host->caps & MMC_CAP_UHS_DDR50) &&

		   (card->sw_caps.sd3_bus_mode & SD_MODE_UHS_DDR50) &&

		    (card->host->f_max > UHS_DDR50_MIN_DTR)) {

		card->sd_bus_speed = UHS_DDR50_BUS_SPEED;

	} else if ((card->host->caps & (MMC_CAP_UHS_SDR104 |

		    MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR25)) &&

		   (card->sw_caps.sd3_bus_mode & SD_MODE_UHS_SDR25) &&