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

Commit 43b7358d authored by Linus Walleij's avatar Linus Walleij Committed by Ulf Hansson
Browse files

mmc: sdhci: pxav3: Delete GPIO handling 



The platform data for the PXAv3 driver allows passing a card
detect GPIO, but this code is not used in the kernel.

In order to not encourage the use of the old global GPIO
numberspace we need to remove this.

Card detect (and write protect) GPIO can easily be added into
the driver using machine descriptor tables instead, and the
descriptor-based (gpiod) variants of the slot GPIO APIs.

Cc: Jisheng Zhang <jszhang@marvell.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarJisheng Zhang <Jisheng.Zhang@synaptics.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b007c4ce

drivers/mmc/host/sdhci-pxav3.c

+0 −14
Original line number Diff line number Diff line
@@ -21,17 +21,14 @@ 
#include <linux/platform_device.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/mmc/card.h>

#include <linux/mmc/host.h>

#include <linux/mmc/slot-gpio.h>

#include <linux/platform_data/pxa_sdhci.h>

#include <linux/slab.h>

#include <linux/delay.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <linux/mbus.h>
@@ -452,16 +449,6 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) 
			host->mmc->caps2 |= pdata->host_caps2;

		if (pdata->pm_caps)

			host->mmc->pm_caps |= pdata->pm_caps;



		if (gpio_is_valid(pdata->ext_cd_gpio)) {

			ret = mmc_gpio_request_cd(host->mmc, pdata->ext_cd_gpio,

						  0);

			if (ret) {

				dev_err(mmc_dev(host->mmc),

					"failed to allocate card detect gpio\n");

				goto err_cd_req;

			}

		}

	}



	pm_runtime_get_noresume(&pdev->dev);
@@ -486,7 +473,6 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

	pm_runtime_put_noidle(&pdev->dev);

err_of_parse:

err_cd_req:

err_mbus_win:

	clk_disable_unprepare(pxa->clk_io);

	clk_disable_unprepare(pxa->clk_core);

include/linux/platform_data/pxa_sdhci.h

+0 −4
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
 *	1: choose feedback clk + delay value

 *	2: choose internal clk

 * @clk_delay_enable: enable clk_delay or not, used on pxa910

 * @ext_cd_gpio: gpio pin used for external CD line

 * @ext_cd_gpio_invert: invert values for external CD gpio line

 * @max_speed: the maximum speed supported

 * @host_caps: Standard MMC host capabilities bit field.

 * @quirks: quirks of platfrom
@@ -46,8 +44,6 @@ struct sdhci_pxa_platdata { 
	unsigned int	clk_delay_cycles;

	unsigned int	clk_delay_sel;

	bool		clk_delay_enable;

	unsigned int	ext_cd_gpio;

	bool		ext_cd_gpio_invert;

	unsigned int	max_speed;

	u32		host_caps;

	u32		host_caps2;