1 From 0483aa124d32bdcafc84623a31141a49e71cc72d Mon Sep 17 00:00:00 2001
2 From: Hans de Goede <hdegoede@redhat.com>
3 Date: Sun, 16 Feb 2014 08:54:20 +0100
4 Subject: [PATCH] sunxi-mmc: fixup: revert "add host initialization for when
5 the sdio irq is enabled"
7 This is not necessary since when the host is not initialized at this point
8 yet the irq line from the mmc controller is not enabled, so writing the
9 host controller interrupt mask cannot cause interrupts at this point.
11 More over doing this is wrong, as it leads to unbalanced calling of
12 clk_prepare_enable and regulator_power_on.
14 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
16 drivers/mmc/host/sunxi-mmc.c | 9 ---------
17 1 file changed, 9 deletions(-)
19 diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
20 index 2dc446c..f33bc30 100644
21 --- a/drivers/mmc/host/sunxi-mmc.c
22 +++ b/drivers/mmc/host/sunxi-mmc.c
23 @@ -593,18 +593,9 @@ static void sunxi_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
25 struct sunxi_mmc_host *smc_host = mmc_priv(mmc);
30 spin_lock_irqsave(&smc_host->lock, flags);
32 - /* Make sure the controller is in a sane state before enabling irqs */
33 - ret = sunxi_mmc_init_host(host->mmc);
35 - spin_unlock_irqrestore(&smc_host->lock, flags);
39 imask = mci_readl(smc_host, REG_IMASK);
41 smc_host->sdio_imask = SDXC_SDIO_INTERRUPT;