mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel
This commit is contained in:
Russell King
parent
c9a8fdd8b3
2ef7f3dbd7
2725898fc9
1587a373f0
e00d9d4b17
6d636c68e9
2ffe2da3e7
cd71f8f48e
ae1402022e
commit
3560adf620
963 changed files with 28297 additions and 8185 deletions
|
|
@ -85,7 +85,14 @@ static void mmc_blk_put(struct mmc_blk_data *md)
|
|||
mutex_lock(&open_lock);
|
||||
md->usage--;
|
||||
if (md->usage == 0) {
|
||||
int devmaj = MAJOR(disk_devt(md->disk));
|
||||
int devidx = MINOR(disk_devt(md->disk)) >> MMC_SHIFT;
|
||||
|
||||
if (!devmaj)
|
||||
devidx = md->disk->first_minor >> MMC_SHIFT;
|
||||
|
||||
blk_cleanup_queue(md->queue.queue);
|
||||
|
||||
__clear_bit(devidx, dev_use);
|
||||
|
||||
put_disk(md->disk);
|
||||
|
|
@ -613,6 +620,7 @@ static int mmc_blk_probe(struct mmc_card *card)
|
|||
return 0;
|
||||
|
||||
out:
|
||||
mmc_cleanup_queue(&md->queue);
|
||||
mmc_blk_put(md);
|
||||
|
||||
return err;
|
||||
|
|
|
|||
|
|
@ -90,9 +90,10 @@ static void mmc_request(struct request_queue *q)
|
|||
struct request *req;
|
||||
|
||||
if (!mq) {
|
||||
printk(KERN_ERR "MMC: killing requests for dead queue\n");
|
||||
while ((req = blk_fetch_request(q)) != NULL)
|
||||
while ((req = blk_fetch_request(q)) != NULL) {
|
||||
req->cmd_flags |= REQ_QUIET;
|
||||
__blk_end_request_all(req, -EIO);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -223,17 +224,18 @@ void mmc_cleanup_queue(struct mmc_queue *mq)
|
|||
struct request_queue *q = mq->queue;
|
||||
unsigned long flags;
|
||||
|
||||
/* Mark that we should start throwing out stragglers */
|
||||
spin_lock_irqsave(q->queue_lock, flags);
|
||||
q->queuedata = NULL;
|
||||
spin_unlock_irqrestore(q->queue_lock, flags);
|
||||
|
||||
/* Make sure the queue isn't suspended, as that will deadlock */
|
||||
mmc_queue_resume(mq);
|
||||
|
||||
/* Then terminate our worker thread */
|
||||
kthread_stop(mq->thread);
|
||||
|
||||
/* Empty the queue */
|
||||
spin_lock_irqsave(q->queue_lock, flags);
|
||||
q->queuedata = NULL;
|
||||
blk_start_queue(q);
|
||||
spin_unlock_irqrestore(q->queue_lock, flags);
|
||||
|
||||
if (mq->bounce_sg)
|
||||
kfree(mq->bounce_sg);
|
||||
mq->bounce_sg = NULL;
|
||||
|
|
@ -245,8 +247,6 @@ void mmc_cleanup_queue(struct mmc_queue *mq)
|
|||
kfree(mq->bounce_buf);
|
||||
mq->bounce_buf = NULL;
|
||||
|
||||
blk_cleanup_queue(mq->queue);
|
||||
|
||||
mq->card = NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(mmc_cleanup_queue);
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ static int mmc_read_ext_csd(struct mmc_card *card)
|
|||
}
|
||||
|
||||
card->ext_csd.rev = ext_csd[EXT_CSD_REV];
|
||||
if (card->ext_csd.rev > 3) {
|
||||
if (card->ext_csd.rev > 5) {
|
||||
printk(KERN_ERR "%s: unrecognised EXT_CSD structure "
|
||||
"version %d\n", mmc_hostname(card->host),
|
||||
card->ext_csd.rev);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
* linux/drivers/mmc/host/mmci.c - ARM PrimeCell MMCI PL180/1 driver
|
||||
*
|
||||
* Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
|
||||
* Copyright (C) 2010 ST-Ericsson AB.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
|
|
@ -34,9 +35,6 @@
|
|||
|
||||
#define DRIVER_NAME "mmci-pl18x"
|
||||
|
||||
#define DBG(host,fmt,args...) \
|
||||
pr_debug("%s: %s: " fmt, mmc_hostname(host->mmc), __func__ , args)
|
||||
|
||||
static unsigned int fmax = 515633;
|
||||
|
||||
/*
|
||||
|
|
@ -105,8 +103,8 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
|
|||
void __iomem *base;
|
||||
int blksz_bits;
|
||||
|
||||
DBG(host, "blksz %04x blks %04x flags %08x\n",
|
||||
data->blksz, data->blocks, data->flags);
|
||||
dev_dbg(mmc_dev(host->mmc), "blksz %04x blks %04x flags %08x\n",
|
||||
data->blksz, data->blocks, data->flags);
|
||||
|
||||
host->data = data;
|
||||
host->size = data->blksz;
|
||||
|
|
@ -155,7 +153,7 @@ mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c)
|
|||
{
|
||||
void __iomem *base = host->base;
|
||||
|
||||
DBG(host, "op %02x arg %08x flags %08x\n",
|
||||
dev_dbg(mmc_dev(host->mmc), "op %02x arg %08x flags %08x\n",
|
||||
cmd->opcode, cmd->arg, cmd->flags);
|
||||
|
||||
if (readl(base + MMCICOMMAND) & MCI_CPSM_ENABLE) {
|
||||
|
|
@ -184,8 +182,20 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
|
|||
{
|
||||
if (status & MCI_DATABLOCKEND) {
|
||||
host->data_xfered += data->blksz;
|
||||
#ifdef CONFIG_ARCH_U300
|
||||
/*
|
||||
* On the U300 some signal or other is
|
||||
* badly routed so that a data write does
|
||||
* not properly terminate with a MCI_DATAEND
|
||||
* status flag. This quirk will make writes
|
||||
* work again.
|
||||
*/
|
||||
if (data->flags & MMC_DATA_WRITE)
|
||||
status |= MCI_DATAEND;
|
||||
#endif
|
||||
}
|
||||
if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
|
||||
dev_dbg(mmc_dev(host->mmc), "MCI ERROR IRQ (status %08x)\n", status);
|
||||
if (status & MCI_DATACRCFAIL)
|
||||
data->error = -EILSEQ;
|
||||
else if (status & MCI_DATATIMEOUT)
|
||||
|
|
@ -307,7 +317,7 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
|
|||
|
||||
status = readl(base + MMCISTATUS);
|
||||
|
||||
DBG(host, "irq1 %08x\n", status);
|
||||
dev_dbg(mmc_dev(host->mmc), "irq1 (pio) %08x\n", status);
|
||||
|
||||
do {
|
||||
unsigned long flags;
|
||||
|
|
@ -401,7 +411,7 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)
|
|||
status &= readl(host->base + MMCIMASK0);
|
||||
writel(status, host->base + MMCICLEAR);
|
||||
|
||||
DBG(host, "irq0 %08x\n", status);
|
||||
dev_dbg(mmc_dev(host->mmc), "irq0 (data+cmd) %08x\n", status);
|
||||
|
||||
data = host->data;
|
||||
if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_TXUNDERRUN|
|
||||
|
|
@ -428,8 +438,8 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
|||
WARN_ON(host->mrq != NULL);
|
||||
|
||||
if (mrq->data && !is_power_of_2(mrq->data->blksz)) {
|
||||
printk(KERN_ERR "%s: Unsupported block size (%d bytes)\n",
|
||||
mmc_hostname(mmc), mrq->data->blksz);
|
||||
dev_err(mmc_dev(mmc), "unsupported block size (%d bytes)\n",
|
||||
mrq->data->blksz);
|
||||
mrq->cmd->error = -EINVAL;
|
||||
mmc_request_done(mmc, mrq);
|
||||
return;
|
||||
|
|
@ -582,8 +592,8 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
|
|||
|
||||
host->hw_designer = amba_manf(dev);
|
||||
host->hw_revision = amba_rev(dev);
|
||||
DBG(host, "designer ID = 0x%02x\n", host->hw_designer);
|
||||
DBG(host, "revision = 0x%01x\n", host->hw_revision);
|
||||
dev_dbg(mmc_dev(mmc), "designer ID = 0x%02x\n", host->hw_designer);
|
||||
dev_dbg(mmc_dev(mmc), "revision = 0x%01x\n", host->hw_revision);
|
||||
|
||||
host->clk = clk_get(&dev->dev, NULL);
|
||||
if (IS_ERR(host->clk)) {
|
||||
|
|
@ -608,7 +618,8 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
|
|||
if (ret < 0)
|
||||
goto clk_disable;
|
||||
host->mclk = clk_get_rate(host->clk);
|
||||
DBG(host, "eventual mclk rate: %u Hz\n", host->mclk);
|
||||
dev_dbg(mmc_dev(mmc), "eventual mclk rate: %u Hz\n",
|
||||
host->mclk);
|
||||
}
|
||||
host->base = ioremap(dev->res.start, resource_size(&dev->res));
|
||||
if (!host->base) {
|
||||
|
|
@ -619,6 +630,8 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
|
|||
mmc->ops = &mmci_ops;
|
||||
mmc->f_min = (host->mclk + 511) / 512;
|
||||
mmc->f_max = min(host->mclk, fmax);
|
||||
dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max);
|
||||
|
||||
#ifdef CONFIG_REGULATOR
|
||||
/* If we're using the regulator framework, try to fetch a regulator */
|
||||
host->vcc = regulator_get(&dev->dev, "vmmc");
|
||||
|
|
@ -712,7 +725,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
|
|||
|
||||
mmc_add_host(mmc);
|
||||
|
||||
printk(KERN_INFO "%s: MMCI rev %x cfg %02x at 0x%016llx irq %d,%d\n",
|
||||
dev_info(&dev->dev, "%s: MMCI rev %x cfg %02x at 0x%016llx irq %d,%d\n",
|
||||
mmc_hostname(mmc), amba_rev(dev), amba_config(dev),
|
||||
(unsigned long long)dev->res.start, dev->irq[0], dev->irq[1]);
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,9 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host, int new_clock)
|
|||
clk |= 0x100;
|
||||
}
|
||||
|
||||
sd_config_write8(host, CNF_SD_CLK_MODE, clk >> 22);
|
||||
if (host->set_clk_div)
|
||||
host->set_clk_div(host->pdev, (clk>>22) & 1);
|
||||
|
||||
sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, clk & 0x1ff);
|
||||
}
|
||||
|
||||
|
|
@ -427,12 +429,13 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
|||
/* Power sequence - OFF -> ON -> UP */
|
||||
switch (ios->power_mode) {
|
||||
case MMC_POWER_OFF: /* power down SD bus */
|
||||
sd_config_write8(host, CNF_PWR_CTL_2, 0x00);
|
||||
if (host->set_pwr)
|
||||
host->set_pwr(host->pdev, 0);
|
||||
tmio_mmc_clk_stop(host);
|
||||
break;
|
||||
case MMC_POWER_ON: /* power up SD bus */
|
||||
|
||||
sd_config_write8(host, CNF_PWR_CTL_2, 0x02);
|
||||
if (host->set_pwr)
|
||||
host->set_pwr(host->pdev, 1);
|
||||
break;
|
||||
case MMC_POWER_UP: /* start bus clock */
|
||||
tmio_mmc_clk_start(host);
|
||||
|
|
@ -485,21 +488,15 @@ static int tmio_mmc_resume(struct platform_device *dev)
|
|||
{
|
||||
struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data;
|
||||
struct mmc_host *mmc = platform_get_drvdata(dev);
|
||||
struct tmio_mmc_host *host = mmc_priv(mmc);
|
||||
int ret = 0;
|
||||
|
||||
/* Tell the MFD core we are ready to be enabled */
|
||||
if (cell->enable) {
|
||||
ret = cell->enable(dev);
|
||||
if (cell->resume) {
|
||||
ret = cell->resume(dev);
|
||||
if (ret)
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* Enable the MMC/SD Control registers */
|
||||
sd_config_write16(host, CNF_CMD, SDCREN);
|
||||
sd_config_write32(host, CNF_CTL_BASE,
|
||||
(dev->resource[0].start >> host->bus_shift) & 0xfffe);
|
||||
|
||||
mmc_resume_host(mmc);
|
||||
|
||||
out:
|
||||
|
|
@ -514,17 +511,16 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
|
|||
{
|
||||
struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data;
|
||||
struct tmio_mmc_data *pdata;
|
||||
struct resource *res_ctl, *res_cnf;
|
||||
struct resource *res_ctl;
|
||||
struct tmio_mmc_host *host;
|
||||
struct mmc_host *mmc;
|
||||
int ret = -EINVAL;
|
||||
|
||||
if (dev->num_resources != 3)
|
||||
if (dev->num_resources != 2)
|
||||
goto out;
|
||||
|
||||
res_ctl = platform_get_resource(dev, IORESOURCE_MEM, 0);
|
||||
res_cnf = platform_get_resource(dev, IORESOURCE_MEM, 1);
|
||||
if (!res_ctl || !res_cnf)
|
||||
if (!res_ctl)
|
||||
goto out;
|
||||
|
||||
pdata = cell->driver_data;
|
||||
|
|
@ -539,8 +535,12 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
|
|||
|
||||
host = mmc_priv(mmc);
|
||||
host->mmc = mmc;
|
||||
host->pdev = dev;
|
||||
platform_set_drvdata(dev, mmc);
|
||||
|
||||
host->set_pwr = pdata->set_pwr;
|
||||
host->set_clk_div = pdata->set_clk_div;
|
||||
|
||||
/* SD control register space size is 0x200, 0x400 for bus_shift=1 */
|
||||
host->bus_shift = resource_size(res_ctl) >> 10;
|
||||
|
||||
|
|
@ -548,10 +548,6 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
|
|||
if (!host->ctl)
|
||||
goto host_free;
|
||||
|
||||
host->cnf = ioremap(res_cnf->start, resource_size(res_cnf));
|
||||
if (!host->cnf)
|
||||
goto unmap_ctl;
|
||||
|
||||
mmc->ops = &tmio_mmc_ops;
|
||||
mmc->caps = MMC_CAP_4_BIT_DATA;
|
||||
mmc->f_max = pdata->hclk;
|
||||
|
|
@ -562,23 +558,9 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
|
|||
if (cell->enable) {
|
||||
ret = cell->enable(dev);
|
||||
if (ret)
|
||||
goto unmap_cnf;
|
||||
goto unmap_ctl;
|
||||
}
|
||||
|
||||
/* Enable the MMC/SD Control registers */
|
||||
sd_config_write16(host, CNF_CMD, SDCREN);
|
||||
sd_config_write32(host, CNF_CTL_BASE,
|
||||
(dev->resource[0].start >> host->bus_shift) & 0xfffe);
|
||||
|
||||
/* Disable SD power during suspend */
|
||||
sd_config_write8(host, CNF_PWR_CTL_3, 0x01);
|
||||
|
||||
/* The below is required but why? FIXME */
|
||||
sd_config_write8(host, CNF_STOP_CLK_CTL, 0x1f);
|
||||
|
||||
/* Power down SD bus*/
|
||||
sd_config_write8(host, CNF_PWR_CTL_2, 0x00);
|
||||
|
||||
tmio_mmc_clk_stop(host);
|
||||
reset(host);
|
||||
|
||||
|
|
@ -586,14 +568,14 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
|
|||
if (ret >= 0)
|
||||
host->irq = ret;
|
||||
else
|
||||
goto unmap_cnf;
|
||||
goto unmap_ctl;
|
||||
|
||||
disable_mmc_irqs(host, TMIO_MASK_ALL);
|
||||
|
||||
ret = request_irq(host->irq, tmio_mmc_irq, IRQF_DISABLED |
|
||||
IRQF_TRIGGER_FALLING, dev_name(&dev->dev), host);
|
||||
if (ret)
|
||||
goto unmap_cnf;
|
||||
goto unmap_ctl;
|
||||
|
||||
mmc_add_host(mmc);
|
||||
|
||||
|
|
@ -605,8 +587,6 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
|
|||
|
||||
return 0;
|
||||
|
||||
unmap_cnf:
|
||||
iounmap(host->cnf);
|
||||
unmap_ctl:
|
||||
iounmap(host->ctl);
|
||||
host_free:
|
||||
|
|
@ -626,7 +606,6 @@ static int __devexit tmio_mmc_remove(struct platform_device *dev)
|
|||
mmc_remove_host(mmc);
|
||||
free_irq(host->irq, host);
|
||||
iounmap(host->ctl);
|
||||
iounmap(host->cnf);
|
||||
mmc_free_host(mmc);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,26 +11,6 @@
|
|||
|
||||
#include <linux/highmem.h>
|
||||
|
||||
#define CNF_CMD 0x04
|
||||
#define CNF_CTL_BASE 0x10
|
||||
#define CNF_INT_PIN 0x3d
|
||||
#define CNF_STOP_CLK_CTL 0x40
|
||||
#define CNF_GCLK_CTL 0x41
|
||||
#define CNF_SD_CLK_MODE 0x42
|
||||
#define CNF_PIN_STATUS 0x44
|
||||
#define CNF_PWR_CTL_1 0x48
|
||||
#define CNF_PWR_CTL_2 0x49
|
||||
#define CNF_PWR_CTL_3 0x4a
|
||||
#define CNF_CARD_DETECT_MODE 0x4c
|
||||
#define CNF_SD_SLOT 0x50
|
||||
#define CNF_EXT_GCLK_CTL_1 0xf0
|
||||
#define CNF_EXT_GCLK_CTL_2 0xf1
|
||||
#define CNF_EXT_GCLK_CTL_3 0xf9
|
||||
#define CNF_SD_LED_EN_1 0xfa
|
||||
#define CNF_SD_LED_EN_2 0xfe
|
||||
|
||||
#define SDCREN 0x2 /* Enable access to MMC CTL regs. (flag in COMMAND_REG)*/
|
||||
|
||||
#define CTL_SD_CMD 0x00
|
||||
#define CTL_ARG_REG 0x04
|
||||
#define CTL_STOP_INTERNAL_ACTION 0x08
|
||||
|
|
@ -110,7 +90,6 @@
|
|||
|
||||
|
||||
struct tmio_mmc_host {
|
||||
void __iomem *cnf;
|
||||
void __iomem *ctl;
|
||||
unsigned long bus_shift;
|
||||
struct mmc_command *cmd;
|
||||
|
|
@ -119,10 +98,16 @@ struct tmio_mmc_host {
|
|||
struct mmc_host *mmc;
|
||||
int irq;
|
||||
|
||||
/* Callbacks for clock / power control */
|
||||
void (*set_pwr)(struct platform_device *host, int state);
|
||||
void (*set_clk_div)(struct platform_device *host, int state);
|
||||
|
||||
/* pio related stuff */
|
||||
struct scatterlist *sg_ptr;
|
||||
unsigned int sg_len;
|
||||
unsigned int sg_off;
|
||||
|
||||
struct platform_device *pdev;
|
||||
};
|
||||
|
||||
#include <linux/io.h>
|
||||
|
|
@ -163,25 +148,6 @@ static inline void sd_ctrl_write32(struct tmio_mmc_host *host, int addr,
|
|||
writew(val >> 16, host->ctl + ((addr + 2) << host->bus_shift));
|
||||
}
|
||||
|
||||
static inline void sd_config_write8(struct tmio_mmc_host *host, int addr,
|
||||
u8 val)
|
||||
{
|
||||
writeb(val, host->cnf + (addr << host->bus_shift));
|
||||
}
|
||||
|
||||
static inline void sd_config_write16(struct tmio_mmc_host *host, int addr,
|
||||
u16 val)
|
||||
{
|
||||
writew(val, host->cnf + (addr << host->bus_shift));
|
||||
}
|
||||
|
||||
static inline void sd_config_write32(struct tmio_mmc_host *host, int addr,
|
||||
u32 val)
|
||||
{
|
||||
writew(val, host->cnf + (addr << host->bus_shift));
|
||||
writew(val >> 16, host->cnf + ((addr + 2) << host->bus_shift));
|
||||
}
|
||||
|
||||
#include <linux/scatterlist.h>
|
||||
#include <linux/blkdev.h>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue