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

Commit e03de745 authored by Andreas Fenkart's avatar Andreas Fenkart Committed by Ulf Hansson
Browse files

mmc: omap_hsmmc: use generic slot-gpio isr to manage card detect pin 



Signed-off-by: default avatarAndreas Fenkart <afenkart@gmail.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 11227d12

drivers/mmc/host/omap_hsmmc.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -418,7 +418,6 @@ static inline int omap_hsmmc_have_reg(void) 




#endif

#endif





static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id);

static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id);

static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id);





static int omap_hsmmc_gpio_init(struct mmc_host *mmc,

static int omap_hsmmc_gpio_init(struct mmc_host *mmc,
@@ -440,7 +439,6 @@ static int omap_hsmmc_gpio_init(struct mmc_host *mmc, 
			return ret;

			return ret;





		host->card_detect = omap_hsmmc_card_detect;

		host->card_detect = omap_hsmmc_card_detect;

		mmc_gpio_set_cd_isr(mmc, omap_hsmmc_detect);

	}

	}





	if (gpio_is_valid(pdata->gpio_wp)) {

	if (gpio_is_valid(pdata->gpio_wp)) {
@@ -1249,17 +1247,6 @@ static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}





/*

 * irq handler to notify the core about card insertion/removal

 */

static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id)

{

	struct omap_hsmmc_host *host = dev_id;



	mmc_detect_change(host->mmc, (HZ * 200) / 1000);

	return IRQ_HANDLED;

}



static void omap_hsmmc_dma_callback(void *param)

static void omap_hsmmc_dma_callback(void *param)

{

{

	struct omap_hsmmc_host *host = param;

	struct omap_hsmmc_host *host = param;