Commit adc16398 authored by Michał Mirosław's avatar Michał Mirosław Committed by Ulf Hansson
Browse files

mmc: sdhci-pci: use generic sdhci_set_bus_width() 



Now that sdhci_set_bus_width() supports 8-bit bus widths based on the
MMC_CAP_8_BIT_DATA capability flag, replace the sdhci-pci version with
the generic sdhci version.

Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 14b04c6a

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

+3 −27
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "sdhci-pci-o2micro.h"



static int sdhci_pci_enable_dma(struct sdhci_host *host);

static void sdhci_pci_set_bus_width(struct sdhci_host *host, int width);

static void sdhci_pci_hw_reset(struct sdhci_host *host);



#ifdef CONFIG_PM_SLEEP
@@ -562,7 +561,7 @@ static const struct sdhci_ops sdhci_intel_byt_ops = { 
	.set_clock		= sdhci_set_clock,

	.set_power		= sdhci_intel_set_power,

	.enable_dma		= sdhci_pci_enable_dma,

	.set_bus_width		= sdhci_pci_set_bus_width,

	.set_bus_width		= sdhci_set_bus_width,

	.reset			= sdhci_reset,

	.set_uhs_signaling	= sdhci_set_uhs_signaling,

	.hw_reset		= sdhci_pci_hw_reset,
@@ -1217,7 +1216,7 @@ static int amd_probe(struct sdhci_pci_chip *chip) 
static const struct sdhci_ops amd_sdhci_pci_ops = {

	.set_clock			= sdhci_set_clock,

	.enable_dma			= sdhci_pci_enable_dma,

	.set_bus_width			= sdhci_pci_set_bus_width,

	.set_bus_width			= sdhci_set_bus_width,

	.reset				= sdhci_reset,

	.set_uhs_signaling		= sdhci_set_uhs_signaling,

	.platform_execute_tuning	= amd_execute_tuning,
@@ -1333,29 +1332,6 @@ static int sdhci_pci_enable_dma(struct sdhci_host *host) 
	return 0;

}



static void sdhci_pci_set_bus_width(struct sdhci_host *host, int width)

{

	u8 ctrl;



	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);



	switch (width) {

	case MMC_BUS_WIDTH_8:

		ctrl |= SDHCI_CTRL_8BITBUS;

		ctrl &= ~SDHCI_CTRL_4BITBUS;

		break;

	case MMC_BUS_WIDTH_4:

		ctrl |= SDHCI_CTRL_4BITBUS;

		ctrl &= ~SDHCI_CTRL_8BITBUS;

		break;

	default:

		ctrl &= ~(SDHCI_CTRL_8BITBUS | SDHCI_CTRL_4BITBUS);

		break;

	}



	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);

}



static void sdhci_pci_gpio_hw_reset(struct sdhci_host *host)

{

	struct sdhci_pci_slot *slot = sdhci_priv(host);
@@ -1382,7 +1358,7 @@ static void sdhci_pci_hw_reset(struct sdhci_host *host) 
static const struct sdhci_ops sdhci_pci_ops = {

	.set_clock	= sdhci_set_clock,

	.enable_dma	= sdhci_pci_enable_dma,

	.set_bus_width	= sdhci_pci_set_bus_width,

	.set_bus_width	= sdhci_set_bus_width,

	.reset		= sdhci_reset,

	.set_uhs_signaling = sdhci_set_uhs_signaling,

	.hw_reset		= sdhci_pci_hw_reset,

CRA Git | Maintained and supported by SUSTech CRA and CCSE