Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81b14543 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Rework sdhci_enable_irq_wakeups() 



In preparation for adding more conditions for whether IRQ wakeup is
enabled, rework sdhci_enable_irq_wakeups() so that needed bits are added
instead of adding them all and then removing the unneeded bits.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 58e79b60

drivers/mmc/host/sdhci.c

+15 −10
Original line number Diff line number Diff line
@@ -2830,20 +2830,25 @@ static irqreturn_t sdhci_thread_irq(int irq, void *dev_id) 
 */

static bool sdhci_enable_irq_wakeups(struct sdhci_host *host)

{

	u8 mask = SDHCI_WAKE_ON_INSERT | SDHCI_WAKE_ON_REMOVE |

		  SDHCI_WAKE_ON_INT;

	u32 irq_val = 0;

	u8 wake_val = 0;

	u8 val;

	u8 mask = SDHCI_WAKE_ON_INSERT | SDHCI_WAKE_ON_REMOVE

			| SDHCI_WAKE_ON_INT;

	u32 irq_val = SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE |

		      SDHCI_INT_CARD_INT;



	val = sdhci_readb(host, SDHCI_WAKE_UP_CONTROL);

	val |= mask ;

	/* Avoid fake wake up */

	if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) {

		val &= ~(SDHCI_WAKE_ON_INSERT | SDHCI_WAKE_ON_REMOVE);

		irq_val &= ~(SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE);

	if (!(host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)) {

		wake_val |= SDHCI_WAKE_ON_INSERT | SDHCI_WAKE_ON_REMOVE;

		irq_val |= SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE;

	}



	wake_val |= SDHCI_WAKE_ON_INT;

	irq_val |= SDHCI_INT_CARD_INT;



	val = sdhci_readb(host, SDHCI_WAKE_UP_CONTROL);

	val &= ~mask;

	val |= wake_val;

	sdhci_writeb(host, val, SDHCI_WAKE_UP_CONTROL);



	sdhci_writel(host, irq_val, SDHCI_INT_ENABLE);



	host->irq_wake_enabled = !enable_irq_wake(host->irq);