From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 07/14] atmel_mci: fix host init
Date: Fri, 25 Jan 2013 16:17:40 +0100 [thread overview]
Message-ID: <1359127067-30079-7-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1359127067-30079-1-git-send-email-plagnioj@jcrosoft.com>
disable interrupt and reset the IP at the probe
set timout at the host init
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
drivers/mci/atmel_mci.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c
index 72d92dc..d5fdd1d 100644
--- a/drivers/mci/atmel_mci.c
+++ b/drivers/mci/atmel_mci.c
@@ -60,13 +60,6 @@ struct atmel_mci {
| ATMCI_OVRE \
| ATMCI_UNRE)
-static void atmci_ip_reset(struct atmel_mci *host)
-{
- atmci_writel(host, ATMCI_CR, ATMCI_CR_SWRST | ATMCI_CR_MCIDIS);
- atmci_writel(host, ATMCI_DTOR, 0x7f);
- atmci_writel(host, ATMCI_IDR, ~0UL);
-}
-
static void atmci_set_clk_rate(struct atmel_mci *host,
unsigned int clock_min)
{
@@ -360,7 +353,8 @@ static int atmci_reset(struct mci_host *mci, struct device_d *mci_dev)
return -ENODEV;
clk_enable(host->clk);
- atmci_ip_reset(host);
+ atmci_writel(host, ATMCI_DTOR, 0x7f);
+ clk_disable(host->clk);
return 0;
}
@@ -519,7 +513,11 @@ static int atmci_probe(struct device_d *hw_dev)
return PTR_ERR(host->clk);
}
+ clk_enable(host->clk);
+ atmci_writel(host, ATMCI_CR, ATMCI_CR_SWRST);
+ atmci_writel(host, ATMCI_IDR, ~0UL);
host->bus_hz = clk_get_rate(host->clk);
+ clk_disable(host->clk);
host->mci.voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
--
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 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
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 ` [PATCH 12/14] atmel_mci: update the SD/SDIO Card Register at request time Jean-Christophe PLAGNIOL-VILLARD
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-7-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