kernel: update linux 3.8 to 3.8.6

[openwrt/staging/chunkeey.git] / target / linux / ramips / patches-3.8 / 0209-owrt-GPIO-add-gpio_export_with_name.patch

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 fbd4a0436a0d8283376665e086fde4944bed54c2..c8b16dc79006b58702174677421ca08b544bc760 100644 (file)
--- 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.3/Documentation/devicetree/bindings/gpio/gpio.txt
-===================================================================
---- linux-3.8.3.orig/Documentation/devicetree/bindings/gpio/gpio.txt   2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/Documentation/devicetree/bindings/gpio/gpio.txt        2013-04-01 11:11:42.151167467 +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.3/Documentation/devicetree/bindings/gpio/gpio.txt
 +              gpio-export,output = <1>;
 +      };
 +};
-Index: linux-3.8.3/drivers/gpio/gpiolib-of.c
-===================================================================
---- linux-3.8.3.orig/drivers/gpio/gpiolib-of.c 2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/drivers/gpio/gpiolib-of.c      2013-04-01 11:11:42.151167467 +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.3/drivers/gpio/gpiolib-of.c
  
  /* Private data structure for of_gpiochip_find_and_xlate */
  struct gg_data {
-@@ -289,3 +291,62 @@
+@@ -289,3 +291,62 @@ void of_gpiochip_remove(struct gpio_chip
        if (chip->of_node)
                of_node_put(chip->of_node);
  }
@@ -158,11 +154,9 @@ Index: linux-3.8.3/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.3/drivers/gpio/gpiolib.c
-===================================================================
---- linux-3.8.3.orig/drivers/gpio/gpiolib.c    2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/drivers/gpio/gpiolib.c 2013-04-01 11:12:29.263168590 +0200
-@@ -714,9 +714,10 @@
+--- a/drivers/gpio/gpiolib.c
++++ b/drivers/gpio/gpiolib.c
+@@ -714,9 +714,10 @@ static struct class gpio_class = {
  
  
  /**
@@ -174,7 +168,7 @@ Index: linux-3.8.3/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.
   */
@@ -183,7 +177,7 @@ Index: linux-3.8.3/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;
        }
  
@@ -192,7 +186,7 @@ Index: linux-3.8.3/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;
  }
@@ -201,11 +195,9 @@ Index: linux-3.8.3/drivers/gpio/gpiolib.c
  
  static int match_export(struct device *dev, void *data)
  {
-Index: linux-3.8.3/include/asm-generic/gpio.h
-===================================================================
---- linux-3.8.3.orig/include/asm-generic/gpio.h        2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/include/asm-generic/gpio.h     2013-04-01 11:11:42.155167467 +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.
   */
@@ -215,7 +207,7 @@ Index: linux-3.8.3/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 */
  
@@ -225,11 +217,9 @@ Index: linux-3.8.3/include/asm-generic/gpio.h
  {
        return -ENOSYS;
  }
-Index: linux-3.8.3/include/linux/gpio.h
-===================================================================
---- linux-3.8.3.orig/include/linux/gpio.h      2013-03-14 19:27:14.000000000 +0100
-+++ linux-3.8.3/include/linux/gpio.h   2013-04-01 11:11:42.159167467 +0200
-@@ -189,7 +189,8 @@
+--- a/include/linux/gpio.h
++++ b/include/linux/gpio.h
+@@ -189,7 +189,8 @@ static inline void gpio_set_value_cansle
        WARN_ON(1);
  }
  
@@ -239,7 +229,7 @@ Index: linux-3.8.3/include/linux/gpio.h
  {
        /* GPIO can never have been requested or set as {in,out}put */
        WARN_ON(1);
-@@ -248,4 +249,24 @@
+@@ -248,4 +249,24 @@ gpiochip_remove_pin_ranges(struct gpio_c
  
  #endif /* ! CONFIG_GENERIC_GPIO */