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

Commit 3fe42e07 authored by Hyuk Lee's avatar Hyuk Lee Committed by Linus Torvalds
Browse files

sdhci-s3c: add SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK quirk 



On Samsung's SDMMC hosts the timeout clock is derivied from the SD Clock
which is set dynamically.  So checked SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK
quirk and removed 'sdhci_s3c_get_timeout_clk' callback which doesn't need
any more.

Signed-off-by: default avatarHyuk Lee <hyuk1.lee@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f3584e5e

drivers/mmc/host/sdhci-s3c.c

+3 −7
Original line number Diff line number Diff line
@@ -110,11 +110,6 @@ static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host) 
	return max;

}



static unsigned int sdhci_s3c_get_timeout_clk(struct sdhci_host *host)

{

	return sdhci_s3c_get_max_clk(host) / 1000000;

}



/**

 * sdhci_s3c_consider_clock - consider one the bus clocks for current setting

 * @ourhost: Our SDHCI instance.
@@ -188,7 +183,6 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock) 


		ourhost->cur_clk = best_src;

		host->max_clk = clk_get_rate(clk);

		host->timeout_clk = sdhci_s3c_get_timeout_clk(host);



		ctrl = readl(host->ioaddr + S3C_SDHCI_CONTROL2);

		ctrl &= ~S3C_SDHCI_CTRL2_SELBASECLK_MASK;
@@ -211,7 +205,6 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock) 


static struct sdhci_ops sdhci_s3c_ops = {

	.get_max_clock		= sdhci_s3c_get_max_clk,

	.get_timeout_clock	= sdhci_s3c_get_timeout_clk,

	.set_clock		= sdhci_s3c_set_clock,

};
@@ -335,6 +328,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) 
	host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR |

			 SDHCI_QUIRK_32BIT_DMA_SIZE);



	/* HSMMC on Samsung SoCs uses SDCLK as timeout clock */

	host->quirks |= SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK;



	ret = sdhci_add_host(host);

	if (ret) {

		dev_err(dev, "sdhci_add_host() failed\n");