diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:34:21 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:34:21 +0200 |
| commit | 7b7631791ed9cad14ed0f54376049fab8807ea2c (patch) | |
| tree | 52341281ba5905b78dcb7f69158c4654b8bbffc4 /drivers/mci | |
| parent | cdfca5dccb21258eccd549604a8481020d5f3e9f (diff) | |
| parent | 4c13cf95b2e37de75b26f2e8770d3b7328e32498 (diff) | |
| download | barebox-7b7631791ed9cad14ed0f54376049fab8807ea2c.tar.gz barebox-7b7631791ed9cad14ed0f54376049fab8807ea2c.tar.xz | |
Merge branch 'for-next/tegra'
Conflicts:
arch/arm/dts/tegra20-colibri.dtsi
arch/arm/dts/tegra20-paz00.dts
arch/arm/dts/tegra20.dtsi
drivers/clk/tegra/clk-periph.c
Diffstat (limited to 'drivers/mci')
| -rw-r--r-- | drivers/mci/tegra-sdmmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mci/tegra-sdmmc.c b/drivers/mci/tegra-sdmmc.c index 64c4550754..e4d82197bd 100644 --- a/drivers/mci/tegra-sdmmc.c +++ b/drivers/mci/tegra-sdmmc.c @@ -339,7 +339,7 @@ static int tegra_sdmmc_init(struct mci_host *mci, struct device_d *dev) val = readl(regs + TEGRA_SDMMC_INT_STAT_EN); val &= ~(0xffff); - val = (TEGRA_SDMMC_INT_STAT_EN_CMD_COMPLETE | + val |= (TEGRA_SDMMC_INT_STAT_EN_CMD_COMPLETE | TEGRA_SDMMC_INT_STAT_EN_XFER_COMPLETE | TEGRA_SDMMC_INT_STAT_EN_DMA_INTERRUPT | TEGRA_SDMMC_INT_STAT_EN_BUFFER_WRITE_READY | @@ -348,7 +348,7 @@ static int tegra_sdmmc_init(struct mci_host *mci, struct device_d *dev) val = readl(regs + TEGRA_SDMMC_INT_SIG_EN); val &= ~(0xffff); - val = TEGRA_SDMMC_INT_SIG_EN_XFER_COMPLETE; + val |= TEGRA_SDMMC_INT_SIG_EN_XFER_COMPLETE; writel(val, regs + TEGRA_SDMMC_INT_SIG_EN); tegra_sdmmc_set_clock(host, 400000); |