KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ralink: Add missing code to free GPIO on Ralink SoC

Browse source 
Signed-off-by: schildt@ibr.cs.tu-bs.de
Acked-by: info@gerhard-bertelsmann.de

SVN-Revision: 42788
This commit is contained in:
John Crispin 2014-10-06 04:52:26 +00:00
parent 70d56d749b
commit 98114e7cdd
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
target/linux/ramips/patches-3.14/0047-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
View file

@ -18,8 +18,10 @@ Cc: linux-gpio@vger.kernel.org
create mode 100644 arch/mips/include/asm/mach-ralink/gpio.h create mode 100644 arch/mips/include/asm/mach-ralink/gpio.h
create mode 100644 drivers/gpio/gpio-ralink.c create mode 100644 drivers/gpio/gpio-ralink.c
--- /dev/null Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/gpio.h
+++ b/arch/mips/include/asm/mach-ralink/gpio.h ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.14.18/arch/mips/include/asm/mach-ralink/gpio.h 2014-09-13 02:13:22.536816660 +0200
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+/* +/*
+ * Ralink SoC GPIO API support + * Ralink SoC GPIO API support
@ -45,9 +47,11 @@ Cc: linux-gpio@vger.kernel.org
+#define gpio_to_irq __gpio_to_irq +#define gpio_to_irq __gpio_to_irq
+ +
+#endif /* __ASM_MACH_RALINK_GPIO_H */ +#endif /* __ASM_MACH_RALINK_GPIO_H */
--- a/drivers/gpio/Kconfig Index: linux-3.14.18/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig ===================================================================
@@ -260,6 +260,12 @@ config GPIO_SCH311X --- linux-3.14.18.orig/drivers/gpio/Kconfig 2014-09-06 01:34:59.000000000 +0200
+++ linux-3.14.18/drivers/gpio/Kconfig 2014-10-02 21:52:28.693719524 +0200
@@ -260,6 +260,12 @@
To compile this driver as a module, choose M here: the module will To compile this driver as a module, choose M here: the module will
be called gpio-sch311x. be called gpio-sch311x.
@ -60,9 +64,11 @@ Cc: linux-gpio@vger.kernel.org
config GPIO_SPEAR_SPICS config GPIO_SPEAR_SPICS
bool "ST SPEAr13xx SPI Chip Select as GPIO support" bool "ST SPEAr13xx SPI Chip Select as GPIO support"
depends on PLAT_SPEAR depends on PLAT_SPEAR
--- a/drivers/gpio/Makefile Index: linux-3.14.18/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile ===================================================================
@@ -63,6 +63,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf85 --- linux-3.14.18.orig/drivers/gpio/Makefile 2014-09-06 01:34:59.000000000 +0200
+++ linux-3.14.18/drivers/gpio/Makefile 2014-10-02 21:52:28.693719524 +0200
@@ -63,6 +63,7 @@
obj-$(CONFIG_GPIO_PCH) += gpio-pch.o obj-$(CONFIG_GPIO_PCH) += gpio-pch.o
obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
@ -70,9 +76,11 @@ Cc: linux-gpio@vger.kernel.org
obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o
obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o
--- /dev/null Index: linux-3.14.18/drivers/gpio/gpio-ralink.c
+++ b/drivers/gpio/gpio-ralink.c ===================================================================
@@ -0,0 +1,345 @@ --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.14.18/drivers/gpio/gpio-ralink.c 2014-10-02 21:52:24.081719605 +0200
@@ -0,0 +1,353 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify it + * 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 published + * under the terms of the GNU General Public License version 2 as published
@ -333,6 +341,13 @@ Cc: linux-gpio@vger.kernel.org
+ return pinctrl_request_gpio(gpio); + return pinctrl_request_gpio(gpio);
+} +}
+ +
+static void ralink_gpio_free(struct gpio_chip *chip, unsigned offset)
+{
+ int gpio = chip->base + offset;
+
+ pinctrl_free_gpio(gpio);
+}
+
+static int ralink_gpio_probe(struct platform_device *pdev) +static int ralink_gpio_probe(struct platform_device *pdev)
+{ +{
+ struct device_node *np = pdev->dev.of_node; + struct device_node *np = pdev->dev.of_node;
@ -386,6 +401,7 @@ Cc: linux-gpio@vger.kernel.org
+ rg->chip.set = ralink_gpio_set; + rg->chip.set = ralink_gpio_set;
+ rg->chip.request = ralink_gpio_request; + rg->chip.request = ralink_gpio_request;
+ rg->chip.to_irq = ralink_gpio_to_irq; + rg->chip.to_irq = ralink_gpio_to_irq;
+ rg->chip.free = ralink_gpio_free;
+ +
+ /* set polarity to low for all lines */ + /* set polarity to low for all lines */
+ rt_gpio_w32(rg, GPIO_REG_POL, 0); + rt_gpio_w32(rg, GPIO_REG_POL, 0);