mmc: Merge branch fixes into next

Ulf Hansson · Ulf Hansson · commit c7461f3e689f · 2023-03-24T16:48:06.000+01:00
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: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
@@ -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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -351,8 +351,6 @@ static void sdhci_am654_write_b(struct sdhci_host *host, u8 val, int reg)`
`351`	`351`	`*/`
`352`	`352`	`case MMC_TIMING_SD_HS:`
`353`	`353`	`case MMC_TIMING_MMC_HS:`
`354`		`- case MMC_TIMING_UHS_SDR12:`
`355`		`- case MMC_TIMING_UHS_SDR25:`
`356`	`354`	`val &= ~SDHCI_CTRL_HISPD;`
`357`	`355`	`}`
`358`	`356`	`}`