Merge tag 'mmc-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc into master

torvalds · torvalds · commit b85bcb784fd8 · 2020-07-24T13:37:38.000-07:00
Pull MMC fix from Ulf Hansson:
 "Fix clock divider calculation in the ASPEED SDHCI controller"

* tag 'mmc-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-of-aspeed: Fix clock divider calculation
diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -68,7 +68,7 @@ static void aspeed_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
 	if (WARN_ON(clock > host->max_clk))
 		clock = host->max_clk;
 
-	for (div = 1; div < 256; div *= 2) {
+	for (div = 2; div < 256; div *= 2) {
 		if ((parent / div) <= clock)
 			break;
 	}

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static void aspeed_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)`
`68`	`68`	`if (WARN_ON(clock > host->max_clk))`
`69`	`69`	`clock = host->max_clk;`
`70`	`70`
`71`		`- for (div = 1; div < 256; div *= 2) {`
	`71`	`+ for (div = 2; div < 256; div *= 2) {`
`72`	`72`	`if ((parent / div) <= clock)`
`73`	`73`	`break;`
`74`	`74`	`}`