target/linux/lantiq/patches-3.18/0030-GPIO-add-named-gpio-exports.patch

   1 From cc809a441d8f2924f785eb863dfa6aef47a25b0b Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Tue, 12 Aug 2014 20:49:27 +0200
   4 Subject: [PATCH 30/36] GPIO: add named gpio exports
   5
   6 Signed-off-by: John Crispin <blogic@openwrt.org>
   7 ---
   8  drivers/gpio/gpiolib-of.c     |   68 +++++++++++++++++++++++++++++++++++++++++
   9  drivers/gpio/gpiolib.c        |   11 +++++--
  10  include/asm-generic/gpio.h    |    5 +++
  11  include/linux/gpio/consumer.h |    8 +++++
  12  4 files changed, 90 insertions(+), 2 deletions(-)
  13
  14 --- a/drivers/gpio/gpiolib-of.c
  15 +++ b/drivers/gpio/gpiolib-of.c
  16 @@ -22,6 +22,8 @@
  17  #include <linux/of_gpio.h>
  18  #include <linux/pinctrl/pinctrl.h>
  19  #include <linux/slab.h>
  20 +#include <linux/init.h>
  21 +#include <linux/platform_device.h>
  22
  23  #include "gpiolib.h"
  24
  25 @@ -315,3 +317,69 @@ void of_gpiochip_remove(struct gpio_chip
  26         gpiochip_remove_pin_ranges(chip);
  27         of_node_put(chip->of_node);
  28  }
  29 +
  30 +static struct of_device_id gpio_export_ids[] = {
  31 +       { .compatible = "gpio-export" },
  32 +       { /* sentinel */ }
  33 +};
  34 +
  35 +static int __init of_gpio_export_probe(struct platform_device *pdev)
  36 +{
  37 +       struct device_node *np = pdev->dev.of_node;
  38 +       struct device_node *cnp;
  39 +       u32 val;
  40 +       int nb = 0;
  41 +
  42 +       for_each_child_of_node(np, cnp) {
  43 +               const char *name = NULL;
  44 +               int gpio;
  45 +               bool dmc;
  46 +               int max_gpio = 1;
  47 +               int i;
  48 +
  49 +               of_property_read_string(cnp, "gpio-export,name", &name);
  50 +
  51 +               if (!name)
  52 +                       max_gpio = of_gpio_count(cnp);
  53 +
  54 +               for (i = 0; i < max_gpio; i++) {
  55 +                       unsigned flags = 0;
  56 +                       enum of_gpio_flags of_flags;
  57 +
  58 +                       gpio = of_get_gpio_flags(cnp, i, &of_flags);
  59 +
  60 +                       if (of_flags == OF_GPIO_ACTIVE_LOW)
  61 +                               flags |= GPIOF_ACTIVE_LOW;
  62 +
  63 +                       if (!of_property_read_u32(cnp, "gpio-export,output", &val))
  64 +                               flags |= val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
  65 +                       else
  66 +                               flags |= GPIOF_IN;
  67 +
  68 +                       if (devm_gpio_request_one(&pdev->dev, gpio, flags, name ? name : of_node_full_name(np)))
  69 +                               continue;
  70 +
  71 +                       dmc = of_property_read_bool(cnp, "gpio-export,direction_may_change");
  72 +                       gpio_export_with_name(gpio, dmc, name);
  73 +                       nb++;
  74 +               }
  75 +       }
  76 +
  77 +       dev_info(&pdev->dev, "%d gpio(s) exported\n", nb);
  78 +
  79 +       return 0;
  80 +}
  81 +
  82 +static struct platform_driver gpio_export_driver = {
  83 +       .driver         = {
  84 +               .name           = "gpio-export",
  85 +               .owner  = THIS_MODULE,
  86 +               .of_match_table = of_match_ptr(gpio_export_ids),
  87 +       },
  88 +};
  89 +
  90 +static int __init of_gpio_export_init(void)
  91 +{
  92 +       return platform_driver_probe(&gpio_export_driver, of_gpio_export_probe);
  93 +}
  94 +device_initcall(of_gpio_export_init);
  95 --- a/include/asm-generic/gpio.h
  96 +++ b/include/asm-generic/gpio.h
  97 @@ -123,6 +123,12 @@ static inline int gpio_export(unsigned g
  98         return gpiod_export(gpio_to_desc(gpio), direction_may_change);
  99  }
 100
 101 +int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name);
 102 +static inline int gpio_export_with_name(unsigned gpio, bool direction_may_change, const char *name)
 103 +{
 104 +       return __gpiod_export(gpio_to_desc(gpio), direction_may_change, name);
 105 +}
 106 +
 107  static inline int gpio_export_link(struct device *dev, const char *name,
 108                                    unsigned gpio)
 109  {
 110 --- a/include/linux/gpio/consumer.h
 111 +++ b/include/linux/gpio/consumer.h
 112 @@ -323,6 +323,7 @@ static inline int desc_to_gpio(const str
 113
 114  #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)
 115
 116 +int _gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name);
 117  int gpiod_export(struct gpio_desc *desc, bool direction_may_change);
 118  int gpiod_export_link(struct device *dev, const char *name,
 119                       struct gpio_desc *desc);
 120 @@ -331,6 +332,13 @@ void gpiod_unexport(struct gpio_desc *de
 121
 122  #else  /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */
 123
 124 +static inline int _gpiod_export(struct gpio_desc *desc,
 125 +                              bool direction_may_change,
 126 +                              const char *name)
 127 +{
 128 +       return -ENOSYS;
 129 +}
 130 +
 131  static inline int gpiod_export(struct gpio_desc *desc,
 132                                bool direction_may_change)
 133  {
 134 --- a/drivers/gpio/gpiolib-sysfs.c
 135 +++ b/drivers/gpio/gpiolib-sysfs.c
 136 @@ -517,7 +517,7 @@ static struct class gpio_class = {
 137   *
 138   * Returns zero on success, else an error.
 139   */
 140 -int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
 141 +int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name)
 142  {
 143         unsigned long           flags;
 144         int                     status;
 145 @@ -557,6 +557,8 @@ int gpiod_export(struct gpio_desc *desc,
 146         offset = gpio_chip_hwgpio(desc);
 147         if (desc->chip->names && desc->chip->names[offset])
 148                 ioname = desc->chip->names[offset];
 149 +       if (name)
 150 +               ioname = name;
 151
 152         dev = device_create_with_groups(&gpio_class, desc->chip->dev,
 153                                         MKDEV(0, 0), desc, gpio_groups,
 154 @@ -593,6 +595,12 @@ fail_unlock:
 155         gpiod_dbg(desc, "%s: status %d\n", __func__, status);
 156         return status;
 157  }
 158 +EXPORT_SYMBOL_GPL(__gpiod_export);
 159 +
 160 +int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
 161 +{
 162 +       return __gpiod_export(desc, direction_may_change, NULL);
 163 +}
 164  EXPORT_SYMBOL_GPL(gpiod_export);
 165
 166  static int match_export(struct device *dev, const void *data)