diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:53:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:53:59 +0100 |
| commit | 86916569a811a07eb1b5a4044fc4f04aeb75383c (patch) | |
| tree | 18652b7fd46eb31c2887fae90a85fb793ec75569 /drivers/mci | |
| parent | 1e5b933b5d2538ea0ffeb86537c3996348ef9c64 (diff) | |
| parent | d91a9642518806f9320e67f5b2c8be9347602c48 (diff) | |
| download | barebox-86916569a811a07eb1b5a4044fc4f04aeb75383c.tar.gz barebox-86916569a811a07eb1b5a4044fc4f04aeb75383c.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers/mci')
| -rw-r--r-- | drivers/mci/imx-esdhc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c index 487cd41958..239cd375fa 100644 --- a/drivers/mci/imx-esdhc.c +++ b/drivers/mci/imx-esdhc.c @@ -474,8 +474,9 @@ static int esdhc_init(struct mci_host *mci, struct device_d *dev) /* Set the initial clock speed */ set_sysctl(mci, 400000); - /* Disable the BRR and BWR bits in IRQSTAT */ - esdhc_clrbits32(regs + SDHCI_INT_ENABLE, IRQSTATEN_BRR | IRQSTATEN_BWR); + writel(IRQSTATEN_CC | IRQSTATEN_TC | IRQSTATEN_CINT | IRQSTATEN_CTOE | + IRQSTATEN_CCE | IRQSTATEN_CEBE | IRQSTATEN_CIE | IRQSTATEN_DTOE | + IRQSTATEN_DCE | IRQSTATEN_DEBE | IRQSTATEN_DINT, regs + SDHCI_INT_ENABLE); /* Put the PROCTL reg back to the default */ esdhc_write32(regs + SDHCI_HOST_CONTROL__POWER_CONTROL__BLOCK_GAP_CONTROL, @@ -606,6 +607,8 @@ static __maybe_unused struct of_device_id fsl_esdhc_compatible[] = { }, { .compatible = "fsl,imx6q-usdhc", }, { + .compatible = "fsl,imx6sl-usdhc", + }, { /* sentinel */ } }; |