diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-28 13:21:09 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-28 13:21:09 +0000 |
commit | f01fd8e50b189be59e546e9a9dcb2db71e98682f (patch) | |
tree | bacf0b240c515c0e4f709fdc2fcb3b60c76d990b /target/linux/brcm63xx/patches-3.14/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch | |
parent | 35996331c3f42e69eace5b57fa5e2e965c026a12 (diff) | |
download | upstream-f01fd8e50b189be59e546e9a9dcb2db71e98682f.tar.gz upstream-f01fd8e50b189be59e546e9a9dcb2db71e98682f.tar.bz2 upstream-f01fd8e50b189be59e546e9a9dcb2db71e98682f.zip |
brcm63xx: remove linux 3.14 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45089 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.14/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch b/target/linux/brcm63xx/patches-3.14/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch deleted file mode 100644 index 524ca1aa0b..0000000000 --- a/target/linux/brcm63xx/patches-3.14/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c4e04f1c54928a49b227a5420d38b18226838775 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski <jogo@openwrt.org> -Date: Wed, 25 Mar 2015 13:54:56 +0100 -Subject: [PATCH 2/2] pcmcia: bcm63xx_pmcia: use the new named gpio - -Use the new named gpio instead of relying on the hardware gpio numbers -matching the virtual gpio numbers. - -Signed-off-by: Jonas Gorski <jogo@openwrt.org> ---- - drivers/pcmcia/bcm63xx_pcmcia.c | 9 ++++++++- - drivers/pcmcia/bcm63xx_pcmcia.h | 4 ++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - ---- a/drivers/pcmcia/bcm63xx_pcmcia.c -+++ b/drivers/pcmcia/bcm63xx_pcmcia.c -@@ -237,7 +237,7 @@ static unsigned int __get_socket_status( - stat |= SS_XVCARD; - stat |= SS_POWERON; - -- if (gpio_get_value(skt->pd->ready_gpio)) -+ if (gpiod_get_value(skt->ready_gpio)) - stat |= SS_READY; - - return stat; -@@ -373,6 +373,13 @@ static int bcm63xx_drv_pcmcia_probe(stru - goto err; - } - -+ /* get ready gpio */ -+ skt->ready_gpio = devm_gpiod_get(&pdev->dev, "ready", GPIOD_IN); -+ if (IS_ERR(skt->ready_gpio)) { -+ ret = PTR_ERR(skt->ready_gpio); -+ goto err; -+ } -+ - /* resources are static */ - sock->resource_ops = &pccard_static_ops; - sock->ops = &bcm63xx_pcmcia_operations; ---- a/drivers/pcmcia/bcm63xx_pcmcia.h -+++ b/drivers/pcmcia/bcm63xx_pcmcia.h -@@ -3,6 +3,7 @@ - - #include <linux/types.h> - #include <linux/timer.h> -+#include <linux/gpio/consumer.h> - #include <pcmcia/ss.h> - #include <bcm63xx_dev_pcmcia.h> - -@@ -55,6 +56,9 @@ struct bcm63xx_pcmcia_socket { - - /* base address of io memory */ - void __iomem *io_base; -+ -+ /* ready gpio */ -+ struct gpio_desc *ready_gpio; - }; - - #endif /* BCM63XX_PCMCIA_H_ */ |