diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-26 09:51:09 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-26 09:51:09 +0100 |
| commit | 412665b46134f93464c09405e02f08ac9c62526d (patch) | |
| tree | 7d45bfd311e81d2d750c0c67edef17ceba17df3f /drivers/mmc | |
| parent | b6379e15a70cc2e22486e5962927d9de374d877b (diff) | |
| parent | ce0c1bc13556fbf1bdfa2a4a27ca6744e7beb32a (diff) | |
| download | u-boot-imx-412665b46134f93464c09405e02f08ac9c62526d.zip u-boot-imx-412665b46134f93464c09405e02f08ac9c62526d.tar.gz u-boot-imx-412665b46134f93464c09405e02f08ac9c62526d.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/sdhci.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index daca0ea..1eaea04 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -412,9 +412,11 @@ int sdhci_init(struct mmc *mmc) status = sdhci_readl(host, SDHCI_PRESENT_STATE); } - /* Eable all state */ - sdhci_writel(host, SDHCI_INT_ALL_MASK, SDHCI_INT_ENABLE); - sdhci_writel(host, SDHCI_INT_ALL_MASK, SDHCI_SIGNAL_ENABLE); + /* Enable only interrupts served by the SD controller */ + sdhci_writel(host, SDHCI_INT_DATA_MASK | SDHCI_INT_CMD_MASK + , SDHCI_INT_ENABLE); + /* Mask all sdhci interrupt sources */ + sdhci_writel(host, 0x0, SDHCI_SIGNAL_ENABLE); return 0; } |