diff options
author | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-27 01:52:28 +0000 |
---|---|---|
committer | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-27 01:52:28 +0000 |
commit | 4e29196f5ef8c81c4921d543dfe6ad03cfc776ec (patch) | |
tree | 90b32b568e37dd68264a916ebdcdb807897b2451 /target/linux/mvebu/patches-3.8/006-mmc_mvsdio_use_slot_gpio.patch | |
parent | a86a9a13ff7e003a10cefa3f115e30b02af6ad22 (diff) |
mvebu: drop 3.8 support
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38225 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.8/006-mmc_mvsdio_use_slot_gpio.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.8/006-mmc_mvsdio_use_slot_gpio.patch | 115 |
1 files changed, 0 insertions, 115 deletions
diff --git a/target/linux/mvebu/patches-3.8/006-mmc_mvsdio_use_slot_gpio.patch b/target/linux/mvebu/patches-3.8/006-mmc_mvsdio_use_slot_gpio.patch deleted file mode 100644 index 7bb8c20d5d..0000000000 --- a/target/linux/mvebu/patches-3.8/006-mmc_mvsdio_use_slot_gpio.patch +++ /dev/null @@ -1,115 +0,0 @@ -From patchwork Wed Jan 16 13:13:57 2013 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [2/5] mmc: mvsdio: use slot-gpio infrastructure for write protect gpio -Date: Wed, 16 Jan 2013 13:13:57 -0000 -From: Andrew Lunn <andrew@lunn.ch> -X-Patchwork-Id: 1987931 -Message-Id: <1358342040-7130-3-git-send-email-andrew@lunn.ch> -To: Jason Cooper <jason@lakedaemon.net> -Cc: linux ARM <linux-arm-kernel@lists.infradead.org>, - linux-mmc@vger.kernel.org, linux@arm.linux.org.uk, - Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, - Andrew Lunn <andrew@lunn.ch> - -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - -The MMC core subsystem provides in drivers/mmc/core/slot-gpio.c a nice -set of helper functions to simplify the management of the write -protect GPIO in MMC host drivers. This patch migrates the mvsdio -driver to using those helpers, which will make the ->probe() code -simpler, and therefore ease the process of adding a Device Tree -binding for this driver. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Signed-off-by: Andrew Lunn <andrew@lunn.ch> -Tested-by: Stefan Peter <s.peter@mpl.ch> -Tested-by: Florian Fainelli <florian@openwrt.org> -Signed-off-by: Jason Cooper <jason@lakedaemon.net> - ---- -drivers/mmc/host/mvsdio.c | 30 +++++------------------------- - 1 file changed, 5 insertions(+), 25 deletions(-) - ---- a/drivers/mmc/host/mvsdio.c -+++ b/drivers/mmc/host/mvsdio.c -@@ -22,6 +22,7 @@ - #include <linux/clk.h> - #include <linux/gpio.h> - #include <linux/mmc/host.h> -+#include <linux/mmc/slot-gpio.h> - - #include <asm/sizes.h> - #include <asm/unaligned.h> -@@ -52,7 +53,6 @@ struct mvsd_host { - struct device *dev; - struct clk *clk; - int gpio_card_detect; -- int gpio_write_protect; - }; - - #define mvsd_write(offs, val) writel(val, iobase + (offs)) -@@ -564,20 +564,6 @@ static void mvsd_enable_sdio_irq(struct - spin_unlock_irqrestore(&host->lock, flags); - } - --static int mvsd_get_ro(struct mmc_host *mmc) --{ -- struct mvsd_host *host = mmc_priv(mmc); -- -- if (host->gpio_write_protect) -- return gpio_get_value(host->gpio_write_protect); -- -- /* -- * Board doesn't support read only detection; let the mmc core -- * decide what to do. -- */ -- return -ENOSYS; --} -- - static void mvsd_power_up(struct mvsd_host *host) - { - void __iomem *iobase = host->base; -@@ -674,7 +660,7 @@ static void mvsd_set_ios(struct mmc_host - - static const struct mmc_host_ops mvsd_ops = { - .request = mvsd_request, -- .get_ro = mvsd_get_ro, -+ .get_ro = mmc_gpio_get_ro, - .set_ios = mvsd_set_ios, - .enable_sdio_irq = mvsd_enable_sdio_irq, - }; -@@ -793,15 +779,7 @@ static int __init mvsd_probe(struct plat - if (!host->gpio_card_detect) - mmc->caps |= MMC_CAP_NEEDS_POLL; - -- if (mvsd_data->gpio_write_protect) { -- ret = devm_gpio_request_one(&pdev->dev, -- mvsd_data->gpio_write_protect, -- GPIOF_IN, DRIVER_NAME " wp"); -- if (ret == 0) { -- host->gpio_write_protect = -- mvsd_data->gpio_write_protect; -- } -- } -+ mmc_gpio_request_ro(mmc, mvsd_data->gpio_write_protect); - - setup_timer(&host->timer, mvsd_timeout_timer, (unsigned long)host); - platform_set_drvdata(pdev, mmc); -@@ -820,6 +798,7 @@ static int __init mvsd_probe(struct plat - - out: - if (mmc) { -+ mmc_gpio_free_ro(mmc); - if (!IS_ERR(host->clk)) - clk_disable_unprepare(host->clk); - mmc_free_host(mmc); -@@ -834,6 +813,7 @@ static int __exit mvsd_remove(struct pla - - struct mvsd_host *host = mmc_priv(mmc); - -+ mmc_gpio_free_ro(mmc); - mmc_remove_host(mmc); - del_timer_sync(&host->timer); - mvsd_power_down(host); |