summaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-01-17 22:28:58 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-01-17 22:28:58 +0000
commit29c21b973be0ba7a07f0b13ef1198155a1ddc055 (patch)
treee1b8cb91fd14e70d1d86740904d027b5c08b01b6 /target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch
parent28acc6588d67f296284f235ce25c86d732cba2c1 (diff)
downloadmaster-31e0f0ae-29c21b973be0ba7a07f0b13ef1198155a1ddc055.tar.gz
master-31e0f0ae-29c21b973be0ba7a07f0b13ef1198155a1ddc055.tar.bz2
master-31e0f0ae-29c21b973be0ba7a07f0b13ef1198155a1ddc055.zip
mvebu: refresh patches
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 35210
Diffstat (limited to 'target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch')
-rw-r--r--target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch b/target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch
index 287dedf1d9..bede3bf7e3 100644
--- a/target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch
+++ b/target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch
@@ -10,8 +10,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
drivers/mmc/host/mvsdio.c | 44 +++++++++-----------------------------------
1 file changed, 9 insertions(+), 35 deletions(-)
-diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index a24a22f..baf19fc 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -54,7 +54,6 @@ struct mvsd_host {
@@ -22,7 +20,7 @@ index a24a22f..baf19fc 100644
};
#define mvsd_write(offs, val) writel(val, iobase + (offs))
-@@ -540,13 +539,6 @@ static void mvsd_timeout_timer(unsigned long data)
+@@ -540,13 +539,6 @@ static void mvsd_timeout_timer(unsigned
mmc_request_done(host->mmc, mrq);
}
@@ -36,7 +34,7 @@ index a24a22f..baf19fc 100644
static void mvsd_enable_sdio_irq(struct mmc_host *mmc, int enable)
{
struct mvsd_host *host = mmc_priv(mmc);
-@@ -765,23 +757,11 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -765,23 +757,11 @@ static int __init mvsd_probe(struct plat
clk_prepare_enable(host->clk);
}
@@ -65,7 +63,7 @@ index a24a22f..baf19fc 100644
mmc->caps |= MMC_CAP_NEEDS_POLL;
mmc_gpio_request_ro(mmc, mvsd_data->gpio_write_protect);
-@@ -794,9 +774,9 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -794,9 +774,9 @@ static int __init mvsd_probe(struct plat
pr_notice("%s: %s driver initialized, ",
mmc_hostname(mmc), DRIVER_NAME);
@@ -89,7 +87,7 @@ index a24a22f..baf19fc 100644
mmc_gpio_free_ro(mmc);
if (host->base)
iounmap(host->base);
-@@ -832,10 +809,7 @@ static int __exit mvsd_remove(struct platform_device *pdev)
+@@ -832,10 +809,7 @@ static int __exit mvsd_remove(struct pla
if (mmc) {
struct mvsd_host *host = mmc_priv(mmc);
@@ -101,5 +99,3 @@ index a24a22f..baf19fc 100644
mmc_remove_host(mmc);
free_irq(host->irq, host);
mmc_gpio_free_ro(mmc);
---
-1.7.9.5