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

Commit 548f07d2 authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Chris Ball
Browse files

mmc: sdhci-s3c: add platform_8bit_width() hook 



We have 8-bit width support but is not a v3 controller.
So we need platform_8bit_width() to support 8-bit buswidth.
Also we need MMC_CAP_8_BIT_DATA, so we add it in platdata.

This gets 8-bit support working again on s3c, after we previously
disabled 8-bit by default on non-v3 controllers.

Signed-off-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 3119cbda

drivers/mmc/host/sdhci-s3c.c

+36 −0
Original line number Original line Diff line number Diff line
@@ -277,10 +277,43 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock) 
	host->clock = clock;

	host->clock = clock;

}

}





/**

 * sdhci_s3c_platform_8bit_width - support 8bit buswidth

 * @host: The SDHCI host being queried

 * @width: MMC_BUS_WIDTH_ macro for the bus width being requested

 *

 * We have 8-bit width support but is not a v3 controller.

 * So we add platform_8bit_width() and support 8bit width.

 */

static int sdhci_s3c_platform_8bit_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:

		break;

	}



	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);



	return 0;

}



static struct sdhci_ops sdhci_s3c_ops = {

static struct sdhci_ops sdhci_s3c_ops = {

	.get_max_clock		= sdhci_s3c_get_max_clk,

	.get_max_clock		= sdhci_s3c_get_max_clk,

	.set_clock		= sdhci_s3c_set_clock,

	.set_clock		= sdhci_s3c_set_clock,

	.get_min_clock		= sdhci_s3c_get_min_clock,

	.get_min_clock		= sdhci_s3c_get_min_clock,

	.platform_8bit_width	= sdhci_s3c_platform_8bit_width,

};

};





static void sdhci_s3c_notify_change(struct platform_device *dev, int state)

static void sdhci_s3c_notify_change(struct platform_device *dev, int state)
@@ -473,6 +506,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) 
	if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT)

	if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT)

		host->mmc->caps = MMC_CAP_NONREMOVABLE;

		host->mmc->caps = MMC_CAP_NONREMOVABLE;





	if (pdata->host_caps)

		host->mmc->caps |= pdata->host_caps;



	host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR |

	host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR |

			 SDHCI_QUIRK_32BIT_DMA_SIZE);

			 SDHCI_QUIRK_32BIT_DMA_SIZE);