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

Commit 4c0c9be0 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde Committed by Chris Ball
Browse files

mmc: mxs-mmc: add cd-inverted property 



The card-detect GPIO is inverted on some boards. Handle such case.

Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 3bffb800

drivers/mmc/host/mxs-mmc.c

+4 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ struct mxs_mmc_host { 
	int				sdio_irq_en;

	int				wp_gpio;

	bool				wp_inverted;

	bool				cd_inverted;

};



static int mxs_mmc_get_ro(struct mmc_host *mmc)
@@ -96,7 +97,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) 
	struct mxs_ssp *ssp = &host->ssp;



	return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &

		 BM_SSP_STATUS_CARD_DETECT);

		 BM_SSP_STATUS_CARD_DETECT)) ^ host->cd_inverted;

}



static void mxs_mmc_reset(struct mxs_mmc_host *host)
@@ -691,6 +692,8 @@ static int mxs_mmc_probe(struct platform_device *pdev) 
	if (flags & OF_GPIO_ACTIVE_LOW)

		host->wp_inverted = 1;



	host->cd_inverted = of_property_read_bool(np, "cd-inverted");



	mmc->f_min = 400000;

	mmc->f_max = 288000000;

	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;