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

Commit 1d53196a authored by Hector Palacios's avatar Hector Palacios Committed by Chris Ball
Browse files

mmc: mxs-mmc: add broken-cd property 



According to bindings documentation for mmc, the property 'broken-cd'
can be used to indicate card-detection is not available and polling
must be used instead. This patch retrieves this property
and sets a custom flag. On the get_cd() hook, it returns 1 if
the flag is set, to always assume the card is present.

Signed-off-by: default avatarHector Palacios <hector.palacios@digi.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 5086e5f4

drivers/mmc/host/mxs-mmc.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -73,6 +73,7 @@ struct mxs_mmc_host { 
	int				wp_gpio;

	int				wp_gpio;

	bool				wp_inverted;

	bool				wp_inverted;

	bool				cd_inverted;

	bool				cd_inverted;

	bool				broken_cd;

	bool				non_removable;

	bool				non_removable;

};

};
@@ -97,7 +98,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) 
	struct mxs_mmc_host *host = mmc_priv(mmc);

	struct mxs_mmc_host *host = mmc_priv(mmc);

	struct mxs_ssp *ssp = &host->ssp;

	struct mxs_ssp *ssp = &host->ssp;





	return host->non_removable ||

	return host->non_removable || host->broken_cd ||

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

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

		  BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;

		  BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;

}

}
@@ -689,6 +690,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) 
		mmc->caps |= MMC_CAP_4_BIT_DATA;

		mmc->caps |= MMC_CAP_4_BIT_DATA;

	else if (bus_width == 8)

	else if (bus_width == 8)

		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;

		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;

	host->broken_cd = of_property_read_bool(np, "broken-cd");

	host->non_removable = of_property_read_bool(np, "non-removable");

	host->non_removable = of_property_read_bool(np, "non-removable");

	if (host->non_removable)

	if (host->non_removable)

		mmc->caps |= MMC_CAP_NONREMOVABLE;

		mmc->caps |= MMC_CAP_NONREMOVABLE;