Commit c7461f3e authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.3-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.4.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 0dd83160 2265098f

drivers/mmc/host/sdhci_am654.c

+0 −2
Original line number Diff line number Diff line
@@ -351,8 +351,6 @@ static void sdhci_am654_write_b(struct sdhci_host *host, u8 val, int reg) 
		 */

		case MMC_TIMING_SD_HS:

		case MMC_TIMING_MMC_HS:

		case MMC_TIMING_UHS_SDR12:

		case MMC_TIMING_UHS_SDR25:

			val &= ~SDHCI_CTRL_HISPD;

		}

	}