diff options
Diffstat (limited to 'target/linux/ramips/patches-3.8')
5 files changed, 85 insertions, 147 deletions
diff --git a/target/linux/ramips/patches-3.8/0128-MIPS-ralink-add-pinmux-driver.patch b/target/linux/ramips/patches-3.8/0128-MIPS-ralink-add-pinmux-driver.patch index 42717127b8..f28115cd18 100644 --- a/target/linux/ramips/patches-3.8/0128-MIPS-ralink-add-pinmux-driver.patch +++ b/target/linux/ramips/patches-3.8/0128-MIPS-ralink-add-pinmux-driver.patch @@ -16,10 +16,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 4 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 arch/mips/ralink/pinmux.c -Index: linux-3.8.11/arch/mips/ralink/Makefile -=================================================================== ---- linux-3.8.11.orig/arch/mips/ralink/Makefile 2013-05-03 17:53:16.612004798 +0200 -+++ linux-3.8.11/arch/mips/ralink/Makefile 2013-05-06 12:29:27.516615708 +0200 +--- a/arch/mips/ralink/Makefile ++++ b/arch/mips/ralink/Makefile @@ -6,7 +6,7 @@ # Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org> # Copyright (C) 2013 John Crispin <blogic@openwrt.org> @@ -29,22 +27,18 @@ Index: linux-3.8.11/arch/mips/ralink/Makefile obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o -Index: linux-3.8.11/arch/mips/ralink/common.h -=================================================================== ---- linux-3.8.11.orig/arch/mips/ralink/common.h 2013-05-03 17:53:16.720004800 +0200 -+++ linux-3.8.11/arch/mips/ralink/common.h 2013-05-06 12:29:27.108615690 +0200 -@@ -50,4 +50,6 @@ +--- a/arch/mips/ralink/common.h ++++ b/arch/mips/ralink/common.h +@@ -50,4 +50,6 @@ extern void prom_soc_init(struct ralink_ __iomem void *plat_of_remap_node(const char *node); +void ralink_pinmux(void); + #endif /* _RALINK_COMMON_H__ */ -Index: linux-3.8.11/arch/mips/ralink/of.c -=================================================================== ---- linux-3.8.11.orig/arch/mips/ralink/of.c 2013-05-03 17:53:16.780004804 +0200 -+++ linux-3.8.11/arch/mips/ralink/of.c 2013-05-06 12:29:27.108615690 +0200 -@@ -110,6 +110,8 @@ +--- a/arch/mips/ralink/of.c ++++ b/arch/mips/ralink/of.c +@@ -110,6 +110,8 @@ static int __init plat_of_setup(void) if (of_platform_populate(NULL, of_ids, NULL, NULL)) panic("failed to populate DT\n"); @@ -53,10 +47,8 @@ Index: linux-3.8.11/arch/mips/ralink/of.c return 0; } -Index: linux-3.8.11/arch/mips/ralink/pinmux.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/arch/mips/ralink/pinmux.c 2013-05-06 12:29:41.212616302 +0200 +--- /dev/null ++++ b/arch/mips/ralink/pinmux.c @@ -0,0 +1,77 @@ +/* + * This program is free software; you can redistribute it and/or modify it diff --git a/target/linux/ramips/patches-3.8/0130-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch b/target/linux/ramips/patches-3.8/0130-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch index e3eeae9e8e..cdff4312dd 100644 --- a/target/linux/ramips/patches-3.8/0130-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch +++ b/target/linux/ramips/patches-3.8/0130-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch @@ -17,11 +17,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 arch/mips/include/asm/mach-ralink/gpio.h create mode 100644 drivers/gpio/gpio-ralink.c -Index: linux-3.8.11/arch/mips/Kconfig -=================================================================== ---- linux-3.8.11.orig/arch/mips/Kconfig 2013-05-04 13:20:48.399042973 +0200 -+++ linux-3.8.11/arch/mips/Kconfig 2013-05-04 13:20:54.963043258 +0200 -@@ -449,6 +449,7 @@ +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -449,6 +449,7 @@ config RALINK select SYS_HAS_EARLY_PRINTK select HAVE_MACH_CLKDEV select CLKDEV_LOOKUP @@ -29,10 +27,8 @@ Index: linux-3.8.11/arch/mips/Kconfig config SGI_IP22 bool "SGI IP22 (Indy/Indigo2)" -Index: linux-3.8.11/arch/mips/include/asm/mach-ralink/gpio.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/arch/mips/include/asm/mach-ralink/gpio.h 2013-05-04 13:20:54.963043258 +0200 +--- /dev/null ++++ b/arch/mips/include/asm/mach-ralink/gpio.h @@ -0,0 +1,24 @@ +/* + * Ralink SoC GPIO API support @@ -58,11 +54,9 @@ Index: linux-3.8.11/arch/mips/include/asm/mach-ralink/gpio.h +#define gpio_to_irq __gpio_to_irq + +#endif /* __ASM_MACH_RALINK_GPIO_H */ -Index: linux-3.8.11/drivers/gpio/Kconfig -=================================================================== ---- linux-3.8.11.orig/drivers/gpio/Kconfig 2013-05-04 13:20:48.399042973 +0200 -+++ linux-3.8.11/drivers/gpio/Kconfig 2013-05-04 13:20:54.963043258 +0200 -@@ -201,6 +201,12 @@ +--- a/drivers/gpio/Kconfig ++++ b/drivers/gpio/Kconfig +@@ -201,6 +201,12 @@ config GPIO_PXA help Say yes here to support the PXA GPIO device @@ -75,11 +69,9 @@ Index: linux-3.8.11/drivers/gpio/Kconfig config GPIO_SPEAR_SPICS bool "ST SPEAr13xx SPI Chip Select as GPIO support" depends on PLAT_SPEAR -Index: linux-3.8.11/drivers/gpio/Makefile -=================================================================== ---- linux-3.8.11.orig/drivers/gpio/Makefile 2013-05-04 13:20:48.399042973 +0200 -+++ linux-3.8.11/drivers/gpio/Makefile 2013-05-04 13:20:54.963043258 +0200 -@@ -54,6 +54,7 @@ +--- a/drivers/gpio/Makefile ++++ b/drivers/gpio/Makefile +@@ -54,6 +54,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf85 obj-$(CONFIG_GPIO_PCH) += gpio-pch.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o @@ -87,10 +79,8 @@ Index: linux-3.8.11/drivers/gpio/Makefile obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_PLAT_SAMSUNG) += gpio-samsung.o -Index: linux-3.8.11/drivers/gpio/gpio-ralink.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/drivers/gpio/gpio-ralink.c 2013-05-06 11:39:24.816485479 +0200 +--- /dev/null ++++ b/drivers/gpio/gpio-ralink.c @@ -0,0 +1,182 @@ +/* + * This program is free software; you can redistribute it and/or modify it diff --git a/target/linux/ramips/patches-3.8/0136-NET-MIPS-add-ralink-SoC-ethernet-driver.patch b/target/linux/ramips/patches-3.8/0136-NET-MIPS-add-ralink-SoC-ethernet-driver.patch index 66abc8bc8e..9bb9b5fb2a 100644 --- a/target/linux/ramips/patches-3.8/0136-NET-MIPS-add-ralink-SoC-ethernet-driver.patch +++ b/target/linux/ramips/patches-3.8/0136-NET-MIPS-add-ralink-SoC-ethernet-driver.patch @@ -26,10 +26,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 drivers/net/ethernet/ramips/ramips_eth.h create mode 100644 drivers/net/ethernet/ramips/ramips_main.c -Index: linux-3.8.11/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h 2013-05-06 12:43:38.148652601 +0200 +--- /dev/null ++++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h @@ -0,0 +1,27 @@ +/* + * Ralink RT305x SoC platform device registration @@ -58,11 +56,9 @@ Index: linux-3.8.11/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h +}; + +#endif /* _RT305X_ESW_PLATFORM_H */ -Index: linux-3.8.11/arch/mips/ralink/rt305x.c -=================================================================== ---- linux-3.8.11.orig/arch/mips/ralink/rt305x.c 2013-05-06 12:43:38.016652594 +0200 -+++ linux-3.8.11/arch/mips/ralink/rt305x.c 2013-05-06 12:43:38.148652601 +0200 -@@ -221,6 +221,7 @@ +--- a/arch/mips/ralink/rt305x.c ++++ b/arch/mips/ralink/rt305x.c +@@ -221,6 +221,7 @@ void __init ralink_clk_init(void) } ralink_clk_add("cpu", cpu_rate); @@ -70,11 +66,9 @@ Index: linux-3.8.11/arch/mips/ralink/rt305x.c ralink_clk_add("10000b00.spi", sys_rate); ralink_clk_add("10000100.timer", wdt_rate); ralink_clk_add("10000120.watchdog", wdt_rate); -Index: linux-3.8.11/drivers/net/ethernet/Kconfig -=================================================================== ---- linux-3.8.11.orig/drivers/net/ethernet/Kconfig 2013-05-01 18:56:10.000000000 +0200 -+++ linux-3.8.11/drivers/net/ethernet/Kconfig 2013-05-06 12:43:38.148652601 +0200 -@@ -136,6 +136,7 @@ +--- a/drivers/net/ethernet/Kconfig ++++ b/drivers/net/ethernet/Kconfig +@@ -136,6 +136,7 @@ source "drivers/net/ethernet/packetengin source "drivers/net/ethernet/pasemi/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/racal/Kconfig" @@ -82,11 +76,9 @@ Index: linux-3.8.11/drivers/net/ethernet/Kconfig source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/rdc/Kconfig" -Index: linux-3.8.11/drivers/net/ethernet/Makefile -=================================================================== ---- linux-3.8.11.orig/drivers/net/ethernet/Makefile 2013-05-01 18:56:10.000000000 +0200 -+++ linux-3.8.11/drivers/net/ethernet/Makefile 2013-05-06 12:43:38.148652601 +0200 -@@ -54,6 +54,7 @@ +--- a/drivers/net/ethernet/Makefile ++++ b/drivers/net/ethernet/Makefile +@@ -54,6 +54,7 @@ obj-$(CONFIG_NET_PACKET_ENGINE) += packe obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ @@ -94,10 +86,8 @@ Index: linux-3.8.11/drivers/net/ethernet/Makefile obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_SH_ETH) += renesas/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ -Index: linux-3.8.11/drivers/net/ethernet/ramips/Kconfig -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/drivers/net/ethernet/ramips/Kconfig 2013-05-06 12:43:38.148652601 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/Kconfig @@ -0,0 +1,18 @@ +config NET_RAMIPS + tristate "Ralink RT288X/RT3X5X/RT3662/RT3883 ethernet driver" @@ -117,10 +107,8 @@ Index: linux-3.8.11/drivers/net/ethernet/ramips/Kconfig + depends on DEBUG_FS + +endif -Index: linux-3.8.11/drivers/net/ethernet/ramips/Makefile -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/drivers/net/ethernet/ramips/Makefile 2013-05-06 12:43:38.148652601 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/Makefile @@ -0,0 +1,9 @@ +# +# Makefile for the Ramips SoCs built-in ethernet macs @@ -131,10 +119,8 @@ Index: linux-3.8.11/drivers/net/ethernet/ramips/Makefile +ramips-$(CONFIG_NET_RAMIPS_DEBUG_FS) += ramips_debugfs.o + +obj-$(CONFIG_NET_RAMIPS) += ramips.o -Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_debugfs.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/drivers/net/ethernet/ramips/ramips_debugfs.c 2013-05-06 12:43:38.148652601 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/ramips_debugfs.c @@ -0,0 +1,127 @@ +/* + * Ralink SoC ethernet driver debugfs code @@ -263,10 +249,8 @@ Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_debugfs.c + debugfs_remove(raeth_debugfs_root); + raeth_debugfs_root = NULL; +} -Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_esw.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/drivers/net/ethernet/ramips/ramips_esw.c 2013-05-06 12:43:38.148652601 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/ramips_esw.c @@ -0,0 +1,1221 @@ +#include <linux/ioport.h> +#include <linux/switch.h> @@ -1489,10 +1473,8 @@ Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_esw.c +{ + platform_driver_unregister(&rt305x_esw_driver); +} -Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_eth.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/drivers/net/ethernet/ramips/ramips_eth.h 2013-05-06 12:43:38.152652600 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/ramips_eth.h @@ -0,0 +1,375 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -1869,10 +1851,8 @@ Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_eth.h +#endif /* CONFIG_NET_RAMIPS_DEBUG_FS */ + +#endif /* RAMIPS_ETH_H */ -Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_main.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/drivers/net/ethernet/ramips/ramips_main.c 2013-05-06 13:55:12.572838852 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/ramips_main.c @@ -0,0 +1,1281 @@ +/* + * This program is free software; you can redistribute it and/or modify diff --git a/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch b/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch index 30e1b87fe7..0fedc91b77 100644 --- a/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch +++ b/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch @@ -19,10 +19,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 arch/mips/ralink/rt305x-usb.c create mode 100644 arch/mips/ralink/rt3883-usb.c -Index: linux-3.8.11/arch/mips/ralink/Makefile -=================================================================== ---- linux-3.8.11.orig/arch/mips/ralink/Makefile 2013-05-06 09:58:57.772224085 +0200 -+++ linux-3.8.11/arch/mips/ralink/Makefile 2013-05-06 10:01:59.252231955 +0200 +--- a/arch/mips/ralink/Makefile ++++ b/arch/mips/ralink/Makefile @@ -9,8 +9,8 @@ obj-y := prom.o of.o reset.o clk.o irq.o pinmux.o timer.o @@ -34,22 +32,18 @@ Index: linux-3.8.11/arch/mips/ralink/Makefile obj-$(CONFIG_SOC_MT7620) += mt7620.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -Index: linux-3.8.11/arch/mips/ralink/common.h -=================================================================== ---- linux-3.8.11.orig/arch/mips/ralink/common.h 2013-05-06 09:58:57.748224086 +0200 -+++ linux-3.8.11/arch/mips/ralink/common.h 2013-05-06 09:58:58.100224099 +0200 -@@ -51,5 +51,6 @@ +--- a/arch/mips/ralink/common.h ++++ b/arch/mips/ralink/common.h +@@ -51,5 +51,6 @@ extern void prom_soc_init(struct ralink_ __iomem void *plat_of_remap_node(const char *node); void ralink_pinmux(void); +void ralink_usb_platform(void); #endif /* _RALINK_COMMON_H__ */ -Index: linux-3.8.11/arch/mips/ralink/mt7620.c -=================================================================== ---- linux-3.8.11.orig/arch/mips/ralink/mt7620.c 2013-05-06 09:58:57.696224079 +0200 -+++ linux-3.8.11/arch/mips/ralink/mt7620.c 2013-05-06 09:58:58.100224099 +0200 -@@ -140,6 +140,11 @@ +--- a/arch/mips/ralink/mt7620.c ++++ b/arch/mips/ralink/mt7620.c +@@ -140,6 +140,11 @@ struct ralink_pinmux rt_gpio_pinmux = { .uart_mask = MT7620_GPIO_MODE_GPIO, }; @@ -61,11 +55,9 @@ Index: linux-3.8.11/arch/mips/ralink/mt7620.c void __init ralink_clk_init(void) { unsigned long cpu_rate, sys_rate; -Index: linux-3.8.11/arch/mips/ralink/of.c -=================================================================== ---- linux-3.8.11.orig/arch/mips/ralink/of.c 2013-05-06 09:58:57.748224086 +0200 -+++ linux-3.8.11/arch/mips/ralink/of.c 2013-05-06 10:01:59.252231955 +0200 -@@ -111,6 +111,7 @@ +--- a/arch/mips/ralink/of.c ++++ b/arch/mips/ralink/of.c +@@ -111,6 +111,7 @@ static int __init plat_of_setup(void) panic("failed to populate DT\n"); ralink_pinmux(); @@ -73,10 +65,8 @@ Index: linux-3.8.11/arch/mips/ralink/of.c return 0; } -Index: linux-3.8.11/arch/mips/ralink/rt305x-usb.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/arch/mips/ralink/rt305x-usb.c 2013-05-06 09:58:58.100224099 +0200 +--- /dev/null ++++ b/arch/mips/ralink/rt305x-usb.c @@ -0,0 +1,120 @@ +/* + * This program is free software; you can redistribute it and/or modify it @@ -198,10 +188,8 @@ Index: linux-3.8.11/arch/mips/ralink/rt305x-usb.c + &rt3352_ehci_data, &rt3352_ehci_dmamask); + } +} -Index: linux-3.8.11/arch/mips/ralink/rt3883-usb.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.11/arch/mips/ralink/rt3883-usb.c 2013-05-06 09:58:58.100224099 +0200 +--- /dev/null ++++ b/arch/mips/ralink/rt3883-usb.c @@ -0,0 +1,118 @@ +/* + * This program is free software; you can redistribute it and/or modify it @@ -321,11 +309,9 @@ Index: linux-3.8.11/arch/mips/ralink/rt3883-usb.c + ralink_add_usb("ehci-platform", + &rt3883_ehci_data, &rt3883_ehci_dmamask); +} -Index: linux-3.8.11/arch/mips/ralink/rt288x.c -=================================================================== ---- linux-3.8.11.orig/arch/mips/ralink/rt288x.c 2013-05-06 09:58:57.644224079 +0200 -+++ linux-3.8.11/arch/mips/ralink/rt288x.c 2013-05-06 10:02:32.216233389 +0200 -@@ -74,6 +74,11 @@ +--- a/arch/mips/ralink/rt288x.c ++++ b/arch/mips/ralink/rt288x.c +@@ -74,6 +74,11 @@ struct ralink_pinmux rt_gpio_pinmux = { .wdt_reset = rt288x_wdt_reset, }; diff --git a/target/linux/ramips/patches-3.8/0209-owrt-GPIO-add-gpio_export_with_name.patch b/target/linux/ramips/patches-3.8/0209-owrt-GPIO-add-gpio_export_with_name.patch index 80d9402b30..c0a1d35c8c 100644 --- a/target/linux/ramips/patches-3.8/0209-owrt-GPIO-add-gpio_export_with_name.patch +++ b/target/linux/ramips/patches-3.8/0209-owrt-GPIO-add-gpio_export_with_name.patch @@ -14,11 +14,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> include/linux/gpio.h | 23 ++++++++- 5 files changed, 160 insertions(+), 8 deletions(-) -Index: linux-3.8.11/Documentation/devicetree/bindings/gpio/gpio.txt -=================================================================== ---- linux-3.8.11.orig/Documentation/devicetree/bindings/gpio/gpio.txt 2013-05-01 18:56:10.000000000 +0200 -+++ linux-3.8.11/Documentation/devicetree/bindings/gpio/gpio.txt 2013-05-06 12:43:38.252652605 +0200 -@@ -112,3 +112,63 @@ +--- a/Documentation/devicetree/bindings/gpio/gpio.txt ++++ b/Documentation/devicetree/bindings/gpio/gpio.txt +@@ -112,3 +112,63 @@ where, The pinctrl node must have "#gpio-range-cells" property to show number of arguments to pass with phandle from gpio controllers node. @@ -82,10 +80,8 @@ Index: linux-3.8.11/Documentation/devicetree/bindings/gpio/gpio.txt + gpio-export,output = <1>; + }; +}; -Index: linux-3.8.11/drivers/gpio/gpiolib-of.c -=================================================================== ---- linux-3.8.11.orig/drivers/gpio/gpiolib-of.c 2013-05-01 18:56:10.000000000 +0200 -+++ linux-3.8.11/drivers/gpio/gpiolib-of.c 2013-05-06 13:35:56.452788709 +0200 +--- a/drivers/gpio/gpiolib-of.c ++++ b/drivers/gpio/gpiolib-of.c @@ -21,6 +21,8 @@ #include <linux/of_gpio.h> #include <linux/pinctrl/pinctrl.h> @@ -95,7 +91,7 @@ Index: linux-3.8.11/drivers/gpio/gpiolib-of.c /* Private data structure for of_gpiochip_find_and_xlate */ struct gg_data { -@@ -288,3 +290,69 @@ +@@ -288,3 +290,69 @@ void of_gpiochip_remove(struct gpio_chip if (chip->of_node) of_node_put(chip->of_node); } @@ -165,11 +161,9 @@ Index: linux-3.8.11/drivers/gpio/gpiolib-of.c + return platform_driver_probe(&gpio_export_driver, of_gpio_export_probe); +} +device_initcall(of_gpio_export_init); -Index: linux-3.8.11/drivers/gpio/gpiolib.c -=================================================================== ---- linux-3.8.11.orig/drivers/gpio/gpiolib.c 2013-05-01 18:56:10.000000000 +0200 -+++ linux-3.8.11/drivers/gpio/gpiolib.c 2013-05-06 13:31:35.060777376 +0200 -@@ -714,9 +714,10 @@ +--- a/drivers/gpio/gpiolib.c ++++ b/drivers/gpio/gpiolib.c +@@ -714,9 +714,10 @@ static struct class gpio_class = { /** @@ -181,7 +175,7 @@ Index: linux-3.8.11/drivers/gpio/gpiolib.c * Context: arch_initcall or later * * When drivers want to make a GPIO accessible to userspace after they -@@ -728,7 +729,7 @@ +@@ -728,7 +729,7 @@ static struct class gpio_class = { * * Returns zero on success, else an error. */ @@ -190,7 +184,7 @@ Index: linux-3.8.11/drivers/gpio/gpiolib.c { unsigned long flags; struct gpio_desc *desc; -@@ -762,6 +763,8 @@ +@@ -762,6 +763,8 @@ int gpio_export(unsigned gpio, bool dire goto fail_unlock; } @@ -199,7 +193,7 @@ Index: linux-3.8.11/drivers/gpio/gpiolib.c if (!desc->chip->direction_input || !desc->chip->direction_output) direction_may_change = false; spin_unlock_irqrestore(&gpio_lock, flags); -@@ -804,7 +807,7 @@ +@@ -804,7 +807,7 @@ fail_unlock: pr_debug("%s: gpio%d status %d\n", __func__, gpio, status); return status; } @@ -208,7 +202,7 @@ Index: linux-3.8.11/drivers/gpio/gpiolib.c static int match_export(struct device *dev, void *data) { -@@ -1418,6 +1421,9 @@ +@@ -1418,6 +1421,9 @@ int gpio_request_one(unsigned gpio, unsi if (flags & GPIOF_OPEN_SOURCE) set_bit(FLAG_OPEN_SOURCE, &gpio_desc[gpio].flags); @@ -218,11 +212,9 @@ Index: linux-3.8.11/drivers/gpio/gpiolib.c if (flags & GPIOF_DIR_IN) err = gpio_direction_input(gpio); else -Index: linux-3.8.11/include/asm-generic/gpio.h -=================================================================== ---- linux-3.8.11.orig/include/asm-generic/gpio.h 2013-05-01 18:56:10.000000000 +0200 -+++ linux-3.8.11/include/asm-generic/gpio.h 2013-05-06 12:43:38.252652605 +0200 -@@ -204,7 +204,8 @@ +--- a/include/asm-generic/gpio.h ++++ b/include/asm-generic/gpio.h +@@ -204,7 +204,8 @@ void devm_gpio_free(struct device *dev, * A sysfs interface can be exported by individual drivers if they want, * but more typically is configured entirely from userspace. */ @@ -232,7 +224,7 @@ Index: linux-3.8.11/include/asm-generic/gpio.h extern int gpio_export_link(struct device *dev, const char *name, unsigned gpio); extern int gpio_sysfs_set_active_low(unsigned gpio, int value); -@@ -249,7 +250,8 @@ +@@ -249,7 +250,8 @@ struct device; /* sysfs support is only available with gpiolib, where it's optional */ @@ -242,10 +234,8 @@ Index: linux-3.8.11/include/asm-generic/gpio.h { return -ENOSYS; } -Index: linux-3.8.11/include/linux/gpio.h -=================================================================== ---- linux-3.8.11.orig/include/linux/gpio.h 2013-05-01 18:56:10.000000000 +0200 -+++ linux-3.8.11/include/linux/gpio.h 2013-05-06 13:32:59.796781050 +0200 +--- a/include/linux/gpio.h ++++ b/include/linux/gpio.h @@ -27,6 +27,9 @@ #define GPIOF_EXPORT_DIR_FIXED (GPIOF_EXPORT) #define GPIOF_EXPORT_DIR_CHANGEABLE (GPIOF_EXPORT | GPIOF_EXPORT_CHANGEABLE) @@ -256,7 +246,7 @@ Index: linux-3.8.11/include/linux/gpio.h /** * struct gpio - a structure describing a GPIO with configuration * @gpio: the GPIO number -@@ -189,7 +192,8 @@ +@@ -189,7 +192,8 @@ static inline void gpio_set_value_cansle WARN_ON(1); } @@ -266,7 +256,7 @@ Index: linux-3.8.11/include/linux/gpio.h { /* GPIO can never have been requested or set as {in,out}put */ WARN_ON(1); -@@ -248,4 +252,24 @@ +@@ -248,4 +252,24 @@ gpiochip_remove_pin_ranges(struct gpio_c #endif /* ! CONFIG_GENERIC_GPIO */ |