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

Commit 8d86e4fc authored by Fabio Estevam's avatar Fabio Estevam Committed by Ulf Hansson
Browse files

mmc: sdhci-esdhc-imx: Call mmc_of_parse() 



Currently it is not possible to use 'mmc-pwrseq-simple' property with this
driver because mmc_of_parse() is never called.

mmc_of_parse() calls mmc_pwrseq_alloc() that manages MMC power sequence and
allows passing GPIOs in the devicetree to properly power/reset the Wifi
chipset.

When using mmc_of_parse() we no longer need to have custom code to request
card-detect and write-protect pins, as this can now be handled by the mmc
core.

Tested on a imx6sl-warp board where BT/Wifi is functional and also on a
imx6q-sabresd.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 49ba0302

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

+6 −32
Original line number Diff line number Diff line
@@ -1013,40 +1013,9 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
					host->mmc->parent->platform_data);

	}



	/* write_protect */

	if (boarddata->wp_type == ESDHC_WP_GPIO) {

		err = mmc_gpio_request_ro(host->mmc, boarddata->wp_gpio);

		if (err) {

			dev_err(mmc_dev(host->mmc),

				"failed to request write-protect gpio!\n");

			goto disable_clk;

		}

		host->mmc->caps2 |= MMC_CAP2_RO_ACTIVE_HIGH;

	}



	/* card_detect */

	switch (boarddata->cd_type) {

	case ESDHC_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");

			goto disable_clk;

		}

		/* fall through */



	case ESDHC_CD_CONTROLLER:

		/* we have a working card_detect back */

	if (boarddata->cd_type == ESDHC_CD_CONTROLLER)

		host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;

		break;



	case ESDHC_CD_PERMANENT:

		host->mmc->caps |= MMC_CAP_NONREMOVABLE;

		break;



	case ESDHC_CD_NONE:

		break;

	}



	switch (boarddata->max_bus_width) {

	case 8:
@@ -1079,6 +1048,11 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
		host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;

	}



	/* call to generic mmc_of_parse to support additional capabilities */

	err = mmc_of_parse(host->mmc);

	if (err)

		goto disable_clk;



	err = sdhci_add_host(host);

	if (err)

		goto disable_clk;