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

Commit 5e5c114d authored by Christian Lütke-Stetzkamp's avatar Christian Lütke-Stetzkamp Committed by Greg Kroah-Hartman
Browse files

staging: mt7621-mmc: Fix different caps for different devices 



Current code saves the need for polling in a global variable, that
leeds to problems, when the driver should handle multiple devices with
different capabilities. By looking up the capability in the mmc_host
capabilities, they now have per device scope.

Signed-off-by: default avatarChristian Lütke-Stetzkamp <christian@lkamp.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c13b45c5

drivers/staging/mt7621-mmc/sd.c

+2 −4
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 
static struct msdc_regs *msdc_reg[HOST_MAX_NUM];

#endif



static int mtk_sw_poll;



static int cd_active_low = 1;
@@ -2361,7 +2360,7 @@ static irqreturn_t msdc_irq(int irq, void *dev_id) 


	/* card change interrupt */

	if (intsts & MSDC_INT_CDSC) {

		if (mtk_sw_poll)

		if (host->mmc->caps & MMC_CAP_NEEDS_POLL)

			return IRQ_HANDLED;

		IRQ_MSG("MSDC_INT_CDSC irq<0x%.8x>", intsts);

#if 0 /* ---/+++ by chhung: fix slot mechanical bounce issue */
@@ -2739,9 +2738,8 @@ static int msdc_drv_probe(struct platform_device *pdev) 
		mmc->caps |= MMC_CAP_SDIO_IRQ;  /* yes for sdio */



	cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high");

	mtk_sw_poll = of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll");



	if (mtk_sw_poll)

	if (of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll"))

		mmc->caps |= MMC_CAP_NEEDS_POLL;



	/* MMC core transfer sizes tunable parameters */