Commit 4edf6f70 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'mmc_pinctrl' into next 



Merge an immutable pinctrl branch from Linus Walleij's tree, which enables
pinctrl code consolidations for mmc.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 7e0b2c32 8e9a9936

drivers/mmc/host/atmel-mci.c

+1 −1
Original line number Diff line number Diff line
@@ -2645,7 +2645,7 @@ static int atmci_runtime_resume(struct device *dev) 
{

	struct atmel_mci *host = dev_get_drvdata(dev);



	pinctrl_pm_select_default_state(dev);

	pinctrl_select_default_state(dev);



	return clk_prepare_enable(host->mck);

}

drivers/mmc/host/jz4740_mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ static int jz4740_mmc_suspend(struct device *dev) 


static int jz4740_mmc_resume(struct device *dev)

{

	return pinctrl_pm_select_default_state(dev);

	return pinctrl_select_default_state(dev);

}



static SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,

drivers/mmc/host/meson-gx-mmc.c

+1 −9
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ struct meson_host { 
	bool dram_access_quirk;



	struct pinctrl *pinctrl;

	struct pinctrl_state *pins_default;

	struct pinctrl_state *pins_clk_gate;



	unsigned int bounce_buf_size;
@@ -327,7 +326,7 @@ static void meson_mmc_clk_ungate(struct meson_host *host) 
	u32 cfg;



	if (host->pins_clk_gate)

		pinctrl_select_state(host->pinctrl, host->pins_default);

		pinctrl_select_default_state(host->dev);



	/* Make sure the clock is not stopped in the controller */

	cfg = readl(host->regs + SD_EMMC_CFG);
@@ -1101,13 +1100,6 @@ static int meson_mmc_probe(struct platform_device *pdev) 
		goto free_host;

	}



	host->pins_default = pinctrl_lookup_state(host->pinctrl,

						  PINCTRL_STATE_DEFAULT);

	if (IS_ERR(host->pins_default)) {

		ret = PTR_ERR(host->pins_default);

		goto free_host;

	}



	host->pins_clk_gate = pinctrl_lookup_state(host->pinctrl,

						   "clk-gate");

	if (IS_ERR(host->pins_clk_gate)) {

drivers/mmc/host/mmci.c

+2 −10
Original line number Diff line number Diff line
@@ -1704,7 +1704,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN)

			pinctrl_select_state(host->pinctrl, host->pins_opendrain);

		else

			pinctrl_select_state(host->pinctrl, host->pins_default);

			pinctrl_select_default_state(mmc_dev(mmc));

	}



	/*
@@ -1877,14 +1877,6 @@ static int mmci_probe(struct amba_device *dev, 
			goto host_free;

		}



		host->pins_default = pinctrl_lookup_state(host->pinctrl,

							  PINCTRL_STATE_DEFAULT);

		if (IS_ERR(host->pins_default)) {

			dev_err(mmc_dev(mmc), "Can't select default pins\n");

			ret = PTR_ERR(host->pins_default);

			goto host_free;

		}



		host->pins_opendrain = pinctrl_lookup_state(host->pinctrl,

							    MMCI_PINCTRL_STATE_OPENDRAIN);

		if (IS_ERR(host->pins_opendrain)) {
@@ -2203,7 +2195,7 @@ static int mmci_runtime_resume(struct device *dev) 
		struct mmci_host *host = mmc_priv(mmc);

		clk_prepare_enable(host->clk);

		mmci_restore(host);

		pinctrl_pm_select_default_state(dev);

		pinctrl_select_default_state(dev);

	}



	return 0;

drivers/mmc/host/mmci.h

+0 −1
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ struct mmci_host { 
	struct mmci_host_ops	*ops;

	struct variant_data	*variant;

	struct pinctrl		*pinctrl;

	struct pinctrl_state	*pins_default;

	struct pinctrl_state	*pins_opendrain;



	u8			hw_designer;