Commit 08b863bb authored by Brian Norris's avatar Brian Norris Committed by Ulf Hansson
Browse files

mmc: sdhci-*: Convert drivers to new sdhci_and_cqhci_reset() 



An earlier patch ("mmc: cqhci: Provide helper for resetting both SDHCI
and CQHCI") does these operations for us.

I keep these as a separate patch, since the earlier patch is a
prerequisite to some important bugfixes that need to be backported via
linux-stable.

Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20221026124150.v4.7.Ia91f031f5f770af7bd2ff3e28b398f277606d970@changeid


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 0614b0ae

drivers/mmc/host/sdhci-msm.c

+2 −8
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/pinctrl/consumer.h>

#include <linux/reset.h>



#include "sdhci-cqhci.h"

#include "sdhci-pltfm.h"

#include "cqhci.h"
@@ -2304,13 +2305,6 @@ static void sdhci_msm_set_regulator_caps(struct sdhci_msm_host *msm_host) 
	pr_debug("%s: supported caps: 0x%08x\n", mmc_hostname(mmc), caps);

}



static void sdhci_msm_reset(struct sdhci_host *host, u8 mask)

{

	if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL))

		cqhci_deactivate(host->mmc);

	sdhci_reset(host, mask);

}



static int sdhci_msm_register_vreg(struct sdhci_msm_host *msm_host)

{

	int ret;
@@ -2450,7 +2444,7 @@ static const struct of_device_id sdhci_msm_dt_match[] = { 
MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);



static const struct sdhci_ops sdhci_msm_ops = {

	.reset = sdhci_msm_reset,

	.reset = sdhci_and_cqhci_reset,

	.set_clock = sdhci_msm_set_clock,

	.get_min_clock = sdhci_msm_get_min_clock,

	.get_max_clock = sdhci_msm_get_max_clock,

drivers/mmc/host/sdhci-pci-core.c

+2 −9
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "cqhci.h"



#include "sdhci.h"

#include "sdhci-cqhci.h"

#include "sdhci-pci.h"



static void sdhci_pci_hw_reset(struct sdhci_host *host);
@@ -234,14 +235,6 @@ static void sdhci_pci_dumpregs(struct mmc_host *mmc) 
	sdhci_dumpregs(mmc_priv(mmc));

}



static void sdhci_cqhci_reset(struct sdhci_host *host, u8 mask)

{

	if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL) &&

	    host->mmc->cqe_private)

		cqhci_deactivate(host->mmc);

	sdhci_reset(host, mask);

}



/*****************************************************************************\

 *                                                                           *

 * Hardware specific quirk handling                                          *
@@ -703,7 +696,7 @@ static const struct sdhci_ops sdhci_intel_glk_ops = { 
	.set_power		= sdhci_intel_set_power,

	.enable_dma		= sdhci_pci_enable_dma,

	.set_bus_width		= sdhci_set_bus_width,

	.reset			= sdhci_cqhci_reset,

	.reset			= sdhci_and_cqhci_reset,

	.set_uhs_signaling	= sdhci_intel_set_uhs_signaling,

	.hw_reset		= sdhci_pci_hw_reset,

	.irq			= sdhci_cqhci_irq,

drivers/mmc/host/sdhci-pci-gli.c

+2 −9
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/of.h>

#include <linux/iopoll.h>

#include "sdhci.h"

#include "sdhci-cqhci.h"

#include "sdhci-pci.h"

#include "cqhci.h"
@@ -922,14 +923,6 @@ static int gl9763e_add_host(struct sdhci_pci_slot *slot) 
	return ret;

}



static void sdhci_gl9763e_reset(struct sdhci_host *host, u8 mask)

{

	if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL) &&

	    host->mmc->cqe_private)

		cqhci_deactivate(host->mmc);

	sdhci_reset(host, mask);

}



static void gli_set_gl9763e(struct sdhci_pci_slot *slot)

{

	struct pci_dev *pdev = slot->chip->pdev;
@@ -1136,7 +1129,7 @@ static const struct sdhci_ops sdhci_gl9763e_ops = { 
	.set_clock		= sdhci_set_clock,

	.enable_dma		= sdhci_pci_enable_dma,

	.set_bus_width		= sdhci_set_bus_width,

	.reset			= sdhci_gl9763e_reset,

	.reset			= sdhci_and_cqhci_reset,

	.set_uhs_signaling	= sdhci_set_gl9763e_signaling,

	.voltage_switch		= sdhci_gli_voltage_switch,

	.irq                    = sdhci_gl9763e_cqhci_irq,