diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2016-12-30 15:30:21 +0900 |
|---|---|---|
| committer | Jaehoon Chung <jh80.chung@samsung.com> | 2017-01-11 19:40:13 +0900 |
| commit | 3fd0a9ba8cee385e9a1f07419269a613c3af4500 (patch) | |
| tree | 9a8297cbca410af78bf0075521f04e3068920432 | |
| parent | f37b7e4f6c0a383a8097268ea595d4cdb1621871 (diff) | |
| download | u-boot-imx-3fd0a9ba8cee385e9a1f07419269a613c3af4500.zip u-boot-imx-3fd0a9ba8cee385e9a1f07419269a613c3af4500.tar.gz u-boot-imx-3fd0a9ba8cee385e9a1f07419269a613c3af4500.tar.bz2 | |
mmc: sdhci: combine the Host controller v3.0 feature into one condition
It doesn't need to seperate the condition.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
| -rw-r--r-- | drivers/mmc/sdhci.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 5d8969a..3a1f4f7 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -572,9 +572,16 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, cfg->voltages |= host->voltages; cfg->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT; + + /* Since Host Controller Version3.0 */ if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) { if (!(caps & SDHCI_CAN_DO_8BIT)) cfg->host_caps &= ~MMC_MODE_8BIT; + + /* Find out whether clock multiplier is supported */ + caps_1 = sdhci_readl(host, SDHCI_CAPABILITIES_1); + host->clk_mul = (caps_1 & SDHCI_CLOCK_MUL_MASK) >> + SDHCI_CLOCK_MUL_SHIFT; } if (host->host_caps) @@ -582,16 +589,6 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; - /* - * In case of Host Controller v3.00, find out whether clock - * multiplier is supported. - */ - if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) { - caps_1 = sdhci_readl(host, SDHCI_CAPABILITIES_1); - host->clk_mul = (caps_1 & SDHCI_CLOCK_MUL_MASK) >> - SDHCI_CLOCK_MUL_SHIFT; - } - return 0; } |