Commit 6fe47179 authored by Thomas Abraham's avatar Thomas Abraham Committed by Chris Ball
Browse files

mmc: sdhci-s3c: add default controller configuration 



The default controller configuration which was previously setup by
platform helper functions is moved into the driver.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 041beb1d

drivers/mmc/host/sdhci-s3c.c

+17 −11
Original line number Diff line number Diff line
@@ -203,17 +203,23 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock) 
		writel(ctrl, host->ioaddr + S3C_SDHCI_CONTROL2);

	}



	/* reconfigure the hardware for new clock rate */

	/* reprogram default hardware configuration */

	writel(S3C64XX_SDHCI_CONTROL4_DRIVE_9mA,

		host->ioaddr + S3C64XX_SDHCI_CONTROL4);



	{

		struct mmc_ios ios;



		ios.clock = clock;

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

	ctrl |= (S3C64XX_SDHCI_CTRL2_ENSTAASYNCCLR |

		  S3C64XX_SDHCI_CTRL2_ENCMDCNFMSK |

		  S3C_SDHCI_CTRL2_ENFBCLKRX |

		  S3C_SDHCI_CTRL2_DFCNT_NONE |

		  S3C_SDHCI_CTRL2_ENCLKOUTHOLD);

	writel(ctrl, host->ioaddr + S3C_SDHCI_CONTROL2);



		if (ourhost->pdata->cfg_card)

			(ourhost->pdata->cfg_card)(ourhost->pdev, host->ioaddr,

						   &ios, NULL);

	}

	/* reconfigure the controller for new clock rate */

	ctrl = (S3C_SDHCI_CTRL3_FCSEL1 | S3C_SDHCI_CTRL3_FCSEL0);

	if (clock < 25 * 1000000)

		ctrl |= (S3C_SDHCI_CTRL3_FCSEL3 | S3C_SDHCI_CTRL3_FCSEL2);

	writel(ctrl, host->ioaddr + S3C_SDHCI_CONTROL3);

}



/**