From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 12/14] atmel_mci: update the SD/SDIO Card Register at request time
Date: Fri, 25 Jan 2013 16:17:45 +0100 [thread overview]
Message-ID: <1359127067-30079-12-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1359127067-30079-1-git-send-email-plagnioj@jcrosoft.com>
as we need to reset the IP
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
drivers/mci/atmel_mci.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c
index 3f24217..8ad0e8a 100644
--- a/drivers/mci/atmel_mci.c
+++ b/drivers/mci/atmel_mci.c
@@ -51,6 +51,7 @@ struct atmel_mci {
unsigned long bus_hz;
u32 mode_reg;
u32 cfg_reg;
+ u32 sdc_reg;
bool need_reset;
};
@@ -382,21 +383,20 @@ static void atmci_set_ios(struct mci_host *mci, struct mci_ios *ios)
dev_dbg(host->hw_dev, "atmel_mci_set_ios: bus_width=%d clk=%d\n",
ios->bus_width, ios->clock);
+ host->sdc_reg &= ~ATMCI_SDCBUS_MASK;
switch (ios->bus_width) {
case MMC_BUS_WIDTH_4:
- atmci_writel(host, ATMCI_SDCR, ATMCI_SDCBUS_4BIT);
+ host->sdc_reg |= ATMCI_SDCBUS_4BIT;
break;
case MMC_BUS_WIDTH_8:
- atmci_writel(host, ATMCI_SDCR, ATMCI_SDCBUS_8BIT);
+ host->sdc_reg |= ATMCI_SDCBUS_8BIT;
break;
case MMC_BUS_WIDTH_1:
- atmci_writel(host, ATMCI_SDCR, ATMCI_SDCBUS_1BIT);
+ host->sdc_reg |= ATMCI_SDCBUS_1BIT;
break;
default:
return;
}
- atmci_writel(host, ATMCI_SDCR, atmci_readl(host, ATMCI_SDCR)
- | host->slot_b);
if (ios->clock) {
atmci_set_clk_rate(host, ios->clock);
@@ -437,6 +437,7 @@ static int atmci_request(struct mci_host *mci, struct mci_cmd *cmd, struct mci_d
atmci_writel(host, ATMCI_CFG, host->cfg_reg);
host->need_reset = false;
}
+ atmci_writel(host, ATMCI_SDCR, host->sdc_reg);
if (cmd->resp_type != MMC_RSP_NONE)
cmdat |= ATMCI_CMDR_MAXLAT_64CYC;
@@ -571,6 +572,11 @@ static int atmci_probe(struct device_d *hw_dev)
if (host->caps.has_highspeed)
host->mci.host_caps |= MMC_MODE_HS;
+ if (host->slot_b)
+ host->sdc_reg = ATMCI_SDCSEL_SLOT_B;
+ else
+ host->sdc_reg = ATMCI_SDCSEL_SLOT_A;
+
mci_register(&host->mci);
return 0;
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-01-25 15:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 15:14 [for master PATCH 00/14] atmel_mci: fixes and cleanup Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 01/14] atmel_mci: rename atmel_mci_host tp atmel_mci Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 02/14] atmel_mci: rename atmel_mci_readl/writel to atmci_readl/writel Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 03/14] atmel_mci: rename all function to start with atmci Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 04/14] atmel_mci: use linux regs define Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 05/14] atmel_mci: detect IP version Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 06/14] atmel_mci: version 0x5xx of the IP have a different clk div Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 07/14] atmel_mci: fix host init Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 08/14] atmel_mci: rwproof is only needed since IP version 0x200 Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 17:31 ` Sascha Hauer
2013-01-25 17:35 ` Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 09/14] atmel_mci: on version 0x0 we need to reset the IP at each request Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 10/14] atmel_mci: after a software timeout the IP need to be reset Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 11/14] atmel_mci: support the SD highspeed since IP version 0x300 Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2013-01-25 15:17 ` [PATCH 13/14] atmel_mci: drop board host caps Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 14/14] atmel_mci: gpio: request and configure card detect Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359127067-30079-12-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox