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

Commit 95f9354b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: bfin_sdh: fix alloc size for private data
  mmc: sdhci-s3c: add platform_8bit_width() hook
  mmc: jz4740: don't treat NULL clk as an error
  mmc: mmci: don't read command response when invalid
  mmc: ushc: Remove duplicate include of usb.h
parents 72056497 a34650f0

drivers/mmc/host/bfin_sdh.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -462,7 +462,7 @@ static int __devinit sdh_probe(struct platform_device *pdev) 
		goto out;

		goto out;

	}

	}





	mmc = mmc_alloc_host(sizeof(*mmc), &pdev->dev);

	mmc = mmc_alloc_host(sizeof(struct sdh_host), &pdev->dev);

	if (!mmc) {

	if (!mmc) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto out;

		goto out;

drivers/mmc/host/jz4740_mmc.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */

 */





#include <linux/mmc/host.h>

#include <linux/mmc/host.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>
@@ -827,8 +828,8 @@ static int __devinit jz4740_mmc_probe(struct platform_device* pdev) 
	}

	}





	host->clk = clk_get(&pdev->dev, "mmc");

	host->clk = clk_get(&pdev->dev, "mmc");

	if (!host->clk) {

	if (IS_ERR(host->clk)) {

		ret = -ENOENT;

		ret = PTR_ERR(host->clk);

		dev_err(&pdev->dev, "Failed to get mmc clock\n");

		dev_err(&pdev->dev, "Failed to get mmc clock\n");

		goto err_free_host;

		goto err_free_host;

	}

	}

drivers/mmc/host/mmci.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -342,15 +342,15 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, 




	host->cmd = NULL;

	host->cmd = NULL;





	cmd->resp[0] = readl(base + MMCIRESPONSE0);

	cmd->resp[1] = readl(base + MMCIRESPONSE1);

	cmd->resp[2] = readl(base + MMCIRESPONSE2);

	cmd->resp[3] = readl(base + MMCIRESPONSE3);



	if (status & MCI_CMDTIMEOUT) {

	if (status & MCI_CMDTIMEOUT) {

		cmd->error = -ETIMEDOUT;

		cmd->error = -ETIMEDOUT;

	} else if (status & MCI_CMDCRCFAIL && cmd->flags & MMC_RSP_CRC) {

	} else if (status & MCI_CMDCRCFAIL && cmd->flags & MMC_RSP_CRC) {

		cmd->error = -EILSEQ;

		cmd->error = -EILSEQ;

	} else {

		cmd->resp[0] = readl(base + MMCIRESPONSE0);

		cmd->resp[1] = readl(base + MMCIRESPONSE1);

		cmd->resp[2] = readl(base + MMCIRESPONSE2);

		cmd->resp[3] = readl(base + MMCIRESPONSE3);

	}

	}





	if (!cmd->data || cmd->error) {

	if (!cmd->data || cmd->error) {

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);

drivers/mmc/host/ushc.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/usb.h>

#include <linux/usb.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/usb.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/mmc/host.h>

#include <linux/mmc/host.h>