diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-01-25 16:17:44 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-25 19:52:43 +0100 |
commit | c934d62029be3454e4c16073367b8405843e46a4 (patch) | |
tree | c02915726d543c026077eb28b3094d8b196971aa /drivers/mci/atmel_mci.c | |
parent | bc33582a8ab917b76142de90aad9aa3057dbb437 (diff) | |
download | barebox-c934d62029be3454e4c16073367b8405843e46a4.tar.gz barebox-c934d62029be3454e4c16073367b8405843e46a4.tar.xz |
atmel_mci: support the SD highspeed since IP version 0x300
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mci/atmel_mci.c')
-rw-r--r-- | drivers/mci/atmel_mci.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c index 53df2e301f..3f24217833 100644 --- a/drivers/mci/atmel_mci.c +++ b/drivers/mci/atmel_mci.c @@ -28,6 +28,8 @@ #include "atmel-mci-regs.h" struct atmel_mci_caps { + bool has_cfg_reg; + bool has_highspeed; bool has_rwproof; bool has_odd_clk_div; bool need_reset_after_xfer; @@ -48,6 +50,7 @@ struct atmel_mci { unsigned long bus_hz; u32 mode_reg; + u32 cfg_reg; bool need_reset; }; @@ -71,6 +74,8 @@ static void atmci_set_clk_rate(struct atmel_mci *host, if (!host->mode_reg) { clk_enable(host->clk); atmci_writel(host, ATMCI_CR, ATMCI_CR_MCIEN); + if (host->caps.has_cfg_reg) + atmci_writel(host, ATMCI_CFG, host->cfg_reg); } if (host->caps.has_odd_clk_div) { @@ -395,6 +400,16 @@ static void atmci_set_ios(struct mci_host *mci, struct mci_ios *ios) if (ios->clock) { atmci_set_clk_rate(host, ios->clock); + + if (host->caps.has_cfg_reg) { + /* setup High Speed mode in relation with card capacity */ + if (ios->timing == MMC_TIMING_SD_HS) + host->cfg_reg |= ATMCI_CFG_HSMODE; + else + host->cfg_reg &= ~ATMCI_CFG_HSMODE; + + atmci_writel(host, ATMCI_CFG, host->cfg_reg); + } } else { atmci_writel(host, ATMCI_CR, ATMCI_CR_MCIDIS); if (host->mode_reg) { @@ -418,6 +433,8 @@ static int atmci_request(struct mci_host *mci, struct mci_cmd *cmd, struct mci_d atmci_writel(host, ATMCI_CR, ATMCI_CR_SWRST); atmci_writel(host, ATMCI_CR, ATMCI_CR_MCIEN); atmci_writel(host, ATMCI_MR, host->mode_reg); + if (host->caps.has_cfg_reg) + atmci_writel(host, ATMCI_CFG, host->cfg_reg); host->need_reset = false; } @@ -481,6 +498,8 @@ static void atmci_get_cap(struct atmel_mci *host) dev_info(host->hw_dev, "version: 0x%x\n", version); + host->caps.has_cfg_reg = 0; + host->caps.has_highspeed = 0; host->caps.need_reset_after_xfer = 1; switch (version & 0xf00) { @@ -488,6 +507,8 @@ static void atmci_get_cap(struct atmel_mci *host) host->caps.has_odd_clk_div = 1; case 0x400: case 0x300: + host->caps.has_cfg_reg = 1; + host->caps.has_highspeed = 1; case 0x200: host->caps.has_rwproof = 1; case 0x100: @@ -547,6 +568,9 @@ static int atmci_probe(struct device_d *hw_dev) atmci_get_cap(host); + if (host->caps.has_highspeed) + host->mci.host_caps |= MMC_MODE_HS; + mci_register(&host->mci); return 0; |