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

Commit 214fc309 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Chris Ball
Browse files

mmc: slot-gpio: Add debouncing capability to mmc_gpio_request_cd() 



Add a debounce parameter to the mmc_gpio_request_cd() function that
enables GPIO debouncing when set to a non-zero value. This can be used
by MMC host drivers to enable debouncing on the card detect signal.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 7725a52c

drivers/mmc/core/host.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ int mmc_of_parse(struct mmc_host *host) 
			if (!(flags & OF_GPIO_ACTIVE_LOW))

				gpio_inv_cd = true;



			ret = mmc_gpio_request_cd(host, gpio);

			ret = mmc_gpio_request_cd(host, gpio, 0);

			if (ret < 0) {

				dev_err(host->parent,

					"Failed to request CD GPIO #%d: %d!\n",

drivers/mmc/core/slot-gpio.c

+13 −1
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ EXPORT_SYMBOL(mmc_gpio_request_ro); 
 * mmc_gpio_request_cd - request a gpio for card-detection

 * @host: mmc host

 * @gpio: gpio number requested

 * @debounce: debounce time in microseconds

 *

 * As devm_* managed functions are used in mmc_gpio_request_cd(), client

 * drivers do not need to explicitly call mmc_gpio_free_cd() for freeing up,
@@ -143,9 +144,14 @@ EXPORT_SYMBOL(mmc_gpio_request_ro); 
 * switching for card-detection, they are responsible for calling

 * mmc_gpio_request_cd() and mmc_gpio_free_cd() as a pair on their own.

 *

 * If GPIO debouncing is desired, set the debounce parameter to a non-zero

 * value. The caller is responsible for ensuring that the GPIO driver associated

 * with the GPIO supports debouncing, otherwise an error will be returned.

 *

 * Returns zero on success, else an error.

 */

int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio)

int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio,

			unsigned int debounce)

{

	struct mmc_gpio *ctx;

	int irq = gpio_to_irq(gpio);
@@ -167,6 +173,12 @@ int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio) 
		 */

		return ret;



	if (debounce) {

		ret = gpio_set_debounce(gpio, debounce);

		if (ret < 0)

			return ret;

	}



	/*

	 * Even if gpio_to_irq() returns a valid IRQ number, the platform might

	 * still prefer to poll, e.g., because that IRQ number is already used

drivers/mmc/host/jz4740_mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static int jz4740_mmc_request_gpios(struct mmc_host *mmc, 
		mmc->caps2 |= MMC_CAP2_RO_ACTIVE_HIGH;



	if (gpio_is_valid(pdata->gpio_card_detect)) {

		ret = mmc_gpio_request_cd(mmc, pdata->gpio_card_detect);

		ret = mmc_gpio_request_cd(mmc, pdata->gpio_card_detect, 0);

		if (ret)

			return ret;

	}

drivers/mmc/host/mvsdio.c

+2 −1
Original line number Diff line number Diff line
@@ -757,7 +757,8 @@ static int __init mvsd_probe(struct platform_device *pdev) 
		if (mvsd_data->gpio_card_detect &&

		    gpio_is_valid(mvsd_data->gpio_card_detect)) {

			ret = mmc_gpio_request_cd(mmc,

						  mvsd_data->gpio_card_detect);

						  mvsd_data->gpio_card_detect,

						  0);

			if (ret)

				goto out;

		} else {

drivers/mmc/host/sdhci-esdhc-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
	/* card_detect */

	switch (boarddata->cd_type) {

	case ESDHC_CD_GPIO:

		err = mmc_gpio_request_cd(host->mmc, boarddata->cd_gpio);

		err = mmc_gpio_request_cd(host->mmc, boarddata->cd_gpio, 0);

		if (err) {

			dev_err(mmc_dev(host->mmc),

				"failed to request card-detect gpio!\n");