pinctrl: assume map table entries can't have a NULL name field
[deliverable/linux.git] / drivers / pinctrl / core.c
index 569bdb3ef1046155b021648390087a9010591d3b..6af6d8d117df44e57849a2dcdc888de5c4eb7749 100644 (file)
@@ -1,12 +1,14 @@
 /*
  * Core driver for the pin control subsystem
  *
- * Copyright (C) 2011 ST-Ericsson SA
+ * Copyright (C) 2011-2012 ST-Ericsson SA
  * Written on behalf of Linaro for ST-Ericsson
  * Based on bits of regulator core, gpio core and clk core
  *
  * Author: Linus Walleij <linus.walleij@linaro.org>
  *
+ * Copyright (C) 2012 NVIDIA CORPORATION. All rights reserved.
+ *
  * License terms: GNU General Public License (GPL) version 2
  */
 #define pr_fmt(fmt) "pinctrl core: " fmt
 #include "pinmux.h"
 #include "pinconf.h"
 
+/**
+ * struct pinctrl_maps - a list item containing part of the mapping table
+ * @node: mapping table list node
+ * @maps: array of mapping table entries
+ * @num_maps: the number of entries in @maps
+ */
+struct pinctrl_maps {
+       struct list_head node;
+       struct pinctrl_map const *maps;
+       unsigned num_maps;
+};
+
 /* Global list of pin control devices */
 static DEFINE_MUTEX(pinctrldev_list_mutex);
 static LIST_HEAD(pinctrldev_list);
 
+/* List of pin controller handles */
+static DEFINE_MUTEX(pinctrl_list_mutex);
+static LIST_HEAD(pinctrl_list);
+
+/* Global pinctrl maps */
+static DEFINE_MUTEX(pinctrl_maps_mutex);
+static LIST_HEAD(pinctrl_maps);
+
+#define for_each_maps(_maps_node_, _i_, _map_) \
+       list_for_each_entry(_maps_node_, &pinctrl_maps, node) \
+               for (_i_ = 0, _map_ = &_maps_node_->maps[_i_]; \
+                       _i_ < _maps_node_->num_maps; \
+                       i++, _map_ = &_maps_node_->maps[_i_])
+
 const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev)
 {
        /* We're not allowed to register devices without name */
@@ -48,31 +76,23 @@ void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev)
 EXPORT_SYMBOL_GPL(pinctrl_dev_get_drvdata);
 
 /**
- * get_pinctrl_dev_from_dev() - look up pin controller device
- * @dev: a device pointer, this may be NULL but then devname needs to be
- *     defined instead
- * @devname: the name of a device instance, as returned by dev_name(), this
- *     may be NULL but then dev needs to be defined instead
+ * get_pinctrl_dev_from_devname() - look up pin controller device
+ * @devname: the name of a device instance, as returned by dev_name()
  *
  * Looks up a pin control device matching a certain device name or pure device
  * pointer, the pure device pointer will take precedence.
  */
-struct pinctrl_dev *get_pinctrl_dev_from_dev(struct device *dev,
-                                            const char *devname)
+struct pinctrl_dev *get_pinctrl_dev_from_devname(const char *devname)
 {
        struct pinctrl_dev *pctldev = NULL;
        bool found = false;
 
+       if (!devname)
+               return NULL;
+
        mutex_lock(&pinctrldev_list_mutex);
        list_for_each_entry(pctldev, &pinctrldev_list, node) {
-               if (dev && pctldev->dev == dev) {
-                       /* Matched on device pointer */
-                       found = true;
-                       break;
-               }
-
-               if (devname &&
-                   !strcmp(dev_name(pctldev->dev), devname)) {
+               if (!strcmp(dev_name(pctldev->dev), devname)) {
                        /* Matched on device name */
                        found = true;
                        break;
@@ -83,18 +103,6 @@ struct pinctrl_dev *get_pinctrl_dev_from_dev(struct device *dev,
        return found ? pctldev : NULL;
 }
 
-struct pin_desc *pin_desc_get(struct pinctrl_dev *pctldev, unsigned int pin)
-{
-       struct pin_desc *pindesc;
-       unsigned long flags;
-
-       spin_lock_irqsave(&pctldev->pin_desc_tree_lock, flags);
-       pindesc = radix_tree_lookup(&pctldev->pin_desc_tree, pin);
-       spin_unlock_irqrestore(&pctldev->pin_desc_tree_lock, flags);
-
-       return pindesc;
-}
-
 /**
  * pin_get_from_name() - look up a pin number from a name
  * @pctldev: the pin control device to lookup the pin on
@@ -150,7 +158,6 @@ static void pinctrl_free_pindescs(struct pinctrl_dev *pctldev,
 {
        int i;
 
-       spin_lock(&pctldev->pin_desc_tree_lock);
        for (i = 0; i < num_pins; i++) {
                struct pin_desc *pindesc;
 
@@ -164,7 +171,6 @@ static void pinctrl_free_pindescs(struct pinctrl_dev *pctldev,
                }
                kfree(pindesc);
        }
-       spin_unlock(&pctldev->pin_desc_tree_lock);
 }
 
 static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
@@ -180,8 +186,10 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
        }
 
        pindesc = kzalloc(sizeof(*pindesc), GFP_KERNEL);
-       if (pindesc == NULL)
+       if (pindesc == NULL) {
+               dev_err(pctldev->dev, "failed to alloc struct pin_desc\n");
                return -ENOMEM;
+       }
 
        spin_lock_init(&pindesc->lock);
 
@@ -189,7 +197,7 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
        pindesc->pctldev = pctldev;
 
        /* Copy basic pin info */
-       if (pindesc->name) {
+       if (name) {
                pindesc->name = name;
        } else {
                pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", number);
@@ -198,9 +206,7 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
                pindesc->dynamic_name = true;
        }
 
-       spin_lock(&pctldev->pin_desc_tree_lock);
        radix_tree_insert(&pctldev->pin_desc_tree, number, pindesc);
-       spin_unlock(&pctldev->pin_desc_tree_lock);
        pr_debug("registered pin %d (%s) on %s\n",
                 number, pindesc->name, pctldev->desc->name);
        return 0;
@@ -261,9 +267,9 @@ pinctrl_match_gpio_range(struct pinctrl_dev *pctldev, unsigned gpio)
  * the GPIO subsystem, return the device and the matching GPIO range. Returns
  * negative if the GPIO range could not be found in any device.
  */
-int pinctrl_get_device_gpio_range(unsigned gpio,
-                               struct pinctrl_dev **outdev,
-                               struct pinctrl_gpio_range **outrange)
+static int pinctrl_get_device_gpio_range(unsigned gpio,
+                                        struct pinctrl_dev **outdev,
+                                        struct pinctrl_gpio_range **outrange)
 {
        struct pinctrl_dev *pctldev = NULL;
 
@@ -297,9 +303,10 @@ void pinctrl_add_gpio_range(struct pinctrl_dev *pctldev,
                            struct pinctrl_gpio_range *range)
 {
        mutex_lock(&pctldev->gpio_ranges_lock);
-       list_add(&range->node, &pctldev->gpio_ranges);
+       list_add_tail(&range->node, &pctldev->gpio_ranges);
        mutex_unlock(&pctldev->gpio_ranges_lock);
 }
+EXPORT_SYMBOL_GPL(pinctrl_add_gpio_range);
 
 /**
  * pinctrl_remove_gpio_range() - remove a range of GPIOs fro a pin controller
@@ -313,6 +320,7 @@ void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev,
        list_del(&range->node);
        mutex_unlock(&pctldev->gpio_ranges_lock);
 }
+EXPORT_SYMBOL_GPL(pinctrl_remove_gpio_range);
 
 /**
  * pinctrl_get_group_selector() - returns the group selector for a group
@@ -345,6 +353,336 @@ int pinctrl_get_group_selector(struct pinctrl_dev *pctldev,
        return -EINVAL;
 }
 
+/**
+ * pinctrl_request_gpio() - request a single pin to be used in as GPIO
+ * @gpio: the GPIO pin number from the GPIO subsystem number space
+ *
+ * This function should *ONLY* be used from gpiolib-based GPIO drivers,
+ * as part of their gpio_request() semantics, platforms and individual drivers
+ * shall *NOT* request GPIO pins to be muxed in.
+ */
+int pinctrl_request_gpio(unsigned gpio)
+{
+       struct pinctrl_dev *pctldev;
+       struct pinctrl_gpio_range *range;
+       int ret;
+       int pin;
+
+       ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range);
+       if (ret)
+               return -EINVAL;
+
+       /* Convert to the pin controllers number space */
+       pin = gpio - range->base + range->pin_base;
+
+       return pinmux_request_gpio(pctldev, range, pin, gpio);
+}
+EXPORT_SYMBOL_GPL(pinctrl_request_gpio);
+
+/**
+ * pinctrl_free_gpio() - free control on a single pin, currently used as GPIO
+ * @gpio: the GPIO pin number from the GPIO subsystem number space
+ *
+ * This function should *ONLY* be used from gpiolib-based GPIO drivers,
+ * as part of their gpio_free() semantics, platforms and individual drivers
+ * shall *NOT* request GPIO pins to be muxed out.
+ */
+void pinctrl_free_gpio(unsigned gpio)
+{
+       struct pinctrl_dev *pctldev;
+       struct pinctrl_gpio_range *range;
+       int ret;
+       int pin;
+
+       ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range);
+       if (ret)
+               return;
+
+       /* Convert to the pin controllers number space */
+       pin = gpio - range->base + range->pin_base;
+
+       return pinmux_free_gpio(pctldev, pin, range);
+}
+EXPORT_SYMBOL_GPL(pinctrl_free_gpio);
+
+static int pinctrl_gpio_direction(unsigned gpio, bool input)
+{
+       struct pinctrl_dev *pctldev;
+       struct pinctrl_gpio_range *range;
+       int ret;
+       int pin;
+
+       ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range);
+       if (ret)
+               return ret;
+
+       /* Convert to the pin controllers number space */
+       pin = gpio - range->base + range->pin_base;
+
+       return pinmux_gpio_direction(pctldev, range, pin, input);
+}
+
+/**
+ * pinctrl_gpio_direction_input() - request a GPIO pin to go into input mode
+ * @gpio: the GPIO pin number from the GPIO subsystem number space
+ *
+ * This function should *ONLY* be used from gpiolib-based GPIO drivers,
+ * as part of their gpio_direction_input() semantics, platforms and individual
+ * drivers shall *NOT* touch pin control GPIO calls.
+ */
+int pinctrl_gpio_direction_input(unsigned gpio)
+{
+       return pinctrl_gpio_direction(gpio, true);
+}
+EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input);
+
+/**
+ * pinctrl_gpio_direction_output() - request a GPIO pin to go into output mode
+ * @gpio: the GPIO pin number from the GPIO subsystem number space
+ *
+ * This function should *ONLY* be used from gpiolib-based GPIO drivers,
+ * as part of their gpio_direction_output() semantics, platforms and individual
+ * drivers shall *NOT* touch pin control GPIO calls.
+ */
+int pinctrl_gpio_direction_output(unsigned gpio)
+{
+       return pinctrl_gpio_direction(gpio, false);
+}
+EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output);
+
+static struct pinctrl *pinctrl_get_locked(struct device *dev, const char *name)
+{
+       struct pinctrl_dev *pctldev = NULL;
+       const char *devname;
+       struct pinctrl *p;
+       unsigned num_maps = 0;
+       int ret = -ENODEV;
+       struct pinctrl_maps *maps_node;
+       int i;
+       struct pinctrl_map const *map;
+
+       /* We must have both a dev and state name */
+       if (WARN_ON(!dev || !name))
+               return ERR_PTR(-EINVAL);
+
+       devname = dev_name(dev);
+
+       dev_dbg(dev, "pinctrl_get() for device %s state %s\n", devname, name);
+
+       /*
+        * create the state cookie holder struct pinctrl for each
+        * mapping, this is what consumers will get when requesting
+        * a pin control handle with pinctrl_get()
+        */
+       p = kzalloc(sizeof(*p), GFP_KERNEL);
+       if (p == NULL) {
+               dev_err(dev, "failed to alloc struct pinctrl\n");
+               return ERR_PTR(-ENOMEM);
+       }
+       mutex_init(&p->mutex);
+       pinmux_init_pinctrl_handle(p);
+
+       /* Iterate over the pin control maps to locate the right ones */
+       for_each_maps(maps_node, i, map) {
+               /*
+                * First, try to find the pctldev given in the map
+                */
+               pctldev = get_pinctrl_dev_from_devname(map->ctrl_dev_name);
+               if (!pctldev) {
+                       dev_err(dev, "unknown pinctrl device %s in map entry",
+                               map->ctrl_dev_name);
+                       pinmux_put(p);
+                       kfree(p);
+                       /* Eventually, this should trigger deferred probe */
+                       return ERR_PTR(-ENODEV);
+               }
+
+               dev_dbg(dev, "in map, found pctldev %s to handle function %s",
+                       dev_name(pctldev->dev), map->function);
+
+               /* Map must be for this device */
+               if (strcmp(map->dev_name, devname))
+                       continue;
+
+               /* State name must be the one we're looking for */
+               if (strcmp(map->name, name))
+                       continue;
+
+               ret = pinmux_apply_muxmap(pctldev, p, dev, devname, map);
+               if (ret) {
+                       kfree(p);
+                       return ERR_PTR(ret);
+               }
+               num_maps++;
+       }
+
+       /*
+        * This may be perfectly legitimate. An IP block may get re-used
+        * across SoCs. Not all of those SoCs may need pinmux settings for the
+        * IP block, e.g. if one SoC dedicates pins to that function but
+        * another doesn't. The driver won't know this, and will always
+        * attempt to set up the pinmux. The mapping table defines whether any
+        * HW programming is actually needed.
+        */
+       if (!num_maps)
+               dev_info(dev, "zero maps found for mapping %s\n", name);
+
+       dev_dbg(dev, "found %u maps for device %s state %s\n",
+               num_maps, devname, name ? name : "(undefined)");
+
+       /* Add the pinmux to the global list */
+       mutex_lock(&pinctrl_list_mutex);
+       list_add_tail(&p->node, &pinctrl_list);
+       mutex_unlock(&pinctrl_list_mutex);
+
+       return p;
+}
+
+/**
+ * pinctrl_get() - retrieves the pin controller handle for a certain device
+ * @dev: the device to get the pin controller handle for
+ * @name: an optional specific control mapping name or NULL, the name is only
+ *     needed if you want to have more than one mapping per device, or if you
+ *     need an anonymous pin control (not tied to any specific device)
+ */
+struct pinctrl *pinctrl_get(struct device *dev, const char *name)
+{
+       struct pinctrl *p;
+
+       mutex_lock(&pinctrl_maps_mutex);
+       p = pinctrl_get_locked(dev, name);
+       mutex_unlock(&pinctrl_maps_mutex);
+
+       return p;
+}
+EXPORT_SYMBOL_GPL(pinctrl_get);
+
+/**
+ * pinctrl_put() - release a previously claimed pin control handle
+ * @p: a pin control handle previously claimed by pinctrl_get()
+ */
+void pinctrl_put(struct pinctrl *p)
+{
+       if (p == NULL)
+               return;
+
+       mutex_lock(&p->mutex);
+       if (p->usecount)
+               pr_warn("releasing pin control handle with active users!\n");
+       /* Free the groups and all acquired pins */
+       pinmux_put(p);
+       mutex_unlock(&p->mutex);
+
+       /* Remove from list */
+       mutex_lock(&pinctrl_list_mutex);
+       list_del(&p->node);
+       mutex_unlock(&pinctrl_list_mutex);
+
+       kfree(p);
+}
+EXPORT_SYMBOL_GPL(pinctrl_put);
+
+/**
+ * pinctrl_enable() - enable a certain pin controller setting
+ * @p: the pin control handle to enable, previously claimed by pinctrl_get()
+ */
+int pinctrl_enable(struct pinctrl *p)
+{
+       int ret = 0;
+
+       if (p == NULL)
+               return -EINVAL;
+       mutex_lock(&p->mutex);
+       if (p->usecount++ == 0) {
+               ret = pinmux_enable(p);
+               if (ret)
+                       p->usecount--;
+       }
+       mutex_unlock(&p->mutex);
+       return ret;
+}
+EXPORT_SYMBOL_GPL(pinctrl_enable);
+
+/**
+ * pinctrl_disable() - disable a certain pin control setting
+ * @p: the pin control handle to disable, previously claimed by pinctrl_get()
+ */
+void pinctrl_disable(struct pinctrl *p)
+{
+       if (p == NULL)
+               return;
+
+       mutex_lock(&p->mutex);
+       if (--p->usecount == 0) {
+               pinmux_disable(p);
+       }
+       mutex_unlock(&p->mutex);
+}
+EXPORT_SYMBOL_GPL(pinctrl_disable);
+
+/**
+ * pinctrl_register_mappings() - register a set of pin controller mappings
+ * @maps: the pincontrol mappings table to register. This should probably be
+ *     marked with __initdata so it can be discarded after boot. This
+ *     function will perform a shallow copy for the mapping entries.
+ * @num_maps: the number of maps in the mapping table
+ */
+int pinctrl_register_mappings(struct pinctrl_map const *maps,
+                             unsigned num_maps)
+{
+       int i;
+       struct pinctrl_maps *maps_node;
+
+       pr_debug("add %d pinmux maps\n", num_maps);
+
+       /* First sanity check the new mapping */
+       for (i = 0; i < num_maps; i++) {
+               if (!maps[i].name) {
+                       pr_err("failed to register map %d: no map name given\n",
+                              i);
+                       return -EINVAL;
+               }
+
+               if (!maps[i].ctrl_dev_name) {
+                       pr_err("failed to register map %s (%d): no pin control device given\n",
+                              maps[i].name, i);
+                       return -EINVAL;
+               }
+
+               if (!maps[i].function) {
+                       pr_err("failed to register map %s (%d): no function ID given\n",
+                              maps[i].name, i);
+                       return -EINVAL;
+               }
+
+               if (!maps[i].dev_name) {
+                       pr_err("failed to register map %s (%d): no device given\n",
+                              maps[i].name, i);
+                       return -EINVAL;
+               }
+       }
+
+       maps_node = kzalloc(sizeof(*maps_node), GFP_KERNEL);
+       if (!maps_node) {
+               pr_err("failed to alloc struct pinctrl_maps\n");
+               return -ENOMEM;
+       }
+
+       maps_node->num_maps = num_maps;
+       maps_node->maps = kmemdup(maps, sizeof(*maps) * num_maps, GFP_KERNEL);
+       if (!maps_node->maps) {
+               pr_err("failed to duplicate mapping table\n");
+               kfree(maps_node);
+               return -ENOMEM;
+       }
+
+       mutex_lock(&pinctrl_maps_mutex);
+       list_add_tail(&maps_node->node, &pinctrl_maps);
+       mutex_unlock(&pinctrl_maps_mutex);
+
+       return 0;
+}
+
 #ifdef CONFIG_DEBUG_FS
 
 static int pinctrl_pins_show(struct seq_file *s, void *what)
@@ -458,6 +796,54 @@ static int pinctrl_devices_show(struct seq_file *s, void *what)
        return 0;
 }
 
+static int pinctrl_maps_show(struct seq_file *s, void *what)
+{
+       struct pinctrl_maps *maps_node;
+       int i;
+       struct pinctrl_map const *map;
+
+       seq_puts(s, "Pinctrl maps:\n");
+
+       mutex_lock(&pinctrl_maps_mutex);
+       for_each_maps(maps_node, i, map) {
+               seq_printf(s, "%s:\n", map->name);
+               seq_printf(s, "  device: %s\n", map->dev_name);
+               seq_printf(s, "  controlling device %s\n", map->ctrl_dev_name);
+               seq_printf(s, "  function: %s\n", map->function);
+               seq_printf(s, "  group: %s\n", map->group ? map->group :
+                          "(default)");
+       }
+       mutex_unlock(&pinctrl_maps_mutex);
+
+       return 0;
+}
+
+static int pinctrl_show(struct seq_file *s, void *what)
+{
+       struct pinctrl *p;
+
+       seq_puts(s, "Requested pin control handlers their pinmux maps:\n");
+       list_for_each_entry(p, &pinctrl_list, node) {
+               struct pinctrl_dev *pctldev = p->pctldev;
+
+               if (!pctldev) {
+                       seq_puts(s, "NO PIN CONTROLLER DEVICE\n");
+                       continue;
+               }
+
+               seq_printf(s, "device: %s",
+                          pinctrl_dev_get_name(p->pctldev));
+
+               pinmux_dbg_show(s, p);
+
+               seq_printf(s, " users: %u map-> %s\n",
+                          p->usecount,
+                          p->dev ? dev_name(p->dev) : "(system)");
+       }
+
+       return 0;
+}
+
 static int pinctrl_pins_open(struct inode *inode, struct file *file)
 {
        return single_open(file, pinctrl_pins_show, inode->i_private);
@@ -478,6 +864,16 @@ static int pinctrl_devices_open(struct inode *inode, struct file *file)
        return single_open(file, pinctrl_devices_show, NULL);
 }
 
+static int pinctrl_maps_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, pinctrl_maps_show, NULL);
+}
+
+static int pinctrl_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, pinctrl_show, NULL);
+}
+
 static const struct file_operations pinctrl_pins_ops = {
        .open           = pinctrl_pins_open,
        .read           = seq_read,
@@ -506,14 +902,30 @@ static const struct file_operations pinctrl_devices_ops = {
        .release        = single_release,
 };
 
+static const struct file_operations pinctrl_maps_ops = {
+       .open           = pinctrl_maps_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+static const struct file_operations pinctrl_ops = {
+       .open           = pinctrl_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
 static struct dentry *debugfs_root;
 
 static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)
 {
-       static struct dentry *device_root;
+       struct dentry *device_root;
 
        device_root = debugfs_create_dir(dev_name(pctldev->dev),
                                         debugfs_root);
+       pctldev->device_root = device_root;
+
        if (IS_ERR(device_root) || !device_root) {
                pr_warn("failed to create debugfs directory for %s\n",
                        dev_name(pctldev->dev));
@@ -529,6 +941,11 @@ static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)
        pinconf_init_device_debugfs(device_root, pctldev);
 }
 
+static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)
+{
+       debugfs_remove_recursive(pctldev->device_root);
+}
+
 static void pinctrl_init_debugfs(void)
 {
        debugfs_root = debugfs_create_dir("pinctrl", NULL);
@@ -540,7 +957,10 @@ static void pinctrl_init_debugfs(void)
 
        debugfs_create_file("pinctrl-devices", S_IFREG | S_IRUGO,
                            debugfs_root, NULL, &pinctrl_devices_ops);
-       pinmux_init_debugfs(debugfs_root);
+       debugfs_create_file("pinctrl-maps", S_IFREG | S_IRUGO,
+                           debugfs_root, NULL, &pinctrl_maps_ops);
+       debugfs_create_file("pinctrl-handles", S_IFREG | S_IRUGO,
+                           debugfs_root, NULL, &pinctrl_ops);
 }
 
 #else /* CONFIG_DEBUG_FS */
@@ -553,6 +973,10 @@ static void pinctrl_init_debugfs(void)
 {
 }
 
+static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)
+{
+}
+
 #endif
 
 /**
@@ -572,40 +996,41 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
        if (pctldesc->name == NULL)
                return NULL;
 
+       pctldev = kzalloc(sizeof(*pctldev), GFP_KERNEL);
+       if (pctldev == NULL) {
+               dev_err(dev, "failed to alloc struct pinctrl_dev\n");
+               return NULL;
+       }
+
+       /* Initialize pin control device struct */
+       pctldev->owner = pctldesc->owner;
+       pctldev->desc = pctldesc;
+       pctldev->driver_data = driver_data;
+       INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL);
+       INIT_LIST_HEAD(&pctldev->gpio_ranges);
+       mutex_init(&pctldev->gpio_ranges_lock);
+       pctldev->dev = dev;
+
        /* If we're implementing pinmuxing, check the ops for sanity */
        if (pctldesc->pmxops) {
-               ret = pinmux_check_ops(pctldesc->pmxops);
+               ret = pinmux_check_ops(pctldev);
                if (ret) {
                        pr_err("%s pinmux ops lacks necessary functions\n",
                               pctldesc->name);
-                       return NULL;
+                       goto out_err;
                }
        }
 
        /* If we're implementing pinconfig, check the ops for sanity */
        if (pctldesc->confops) {
-               ret = pinconf_check_ops(pctldesc->confops);
+               ret = pinconf_check_ops(pctldev);
                if (ret) {
                        pr_err("%s pin config ops lacks necessary functions\n",
                               pctldesc->name);
-                       return NULL;
+                       goto out_err;
                }
        }
 
-       pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL);
-       if (pctldev == NULL)
-               return NULL;
-
-       /* Initialize pin control device struct */
-       pctldev->owner = pctldesc->owner;
-       pctldev->desc = pctldesc;
-       pctldev->driver_data = driver_data;
-       INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL);
-       spin_lock_init(&pctldev->pin_desc_tree_lock);
-       INIT_LIST_HEAD(&pctldev->gpio_ranges);
-       mutex_init(&pctldev->gpio_ranges_lock);
-       pctldev->dev = dev;
-
        /* Register all the pins */
        pr_debug("try to register %d pins on %s...\n",
                 pctldesc->npins, pctldesc->name);
@@ -617,11 +1042,14 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
                goto out_err;
        }
 
-       pinctrl_init_device_debugfs(pctldev);
        mutex_lock(&pinctrldev_list_mutex);
-       list_add(&pctldev->node, &pinctrldev_list);
+       list_add_tail(&pctldev->node, &pinctrldev_list);
        mutex_unlock(&pinctrldev_list_mutex);
-       pinmux_hog_maps(pctldev);
+       pctldev->p = pinctrl_get(pctldev->dev, PINCTRL_STATE_DEFAULT);
+       if (!IS_ERR(pctldev->p))
+               pinctrl_enable(pctldev->p);
+       pinctrl_init_device_debugfs(pctldev);
+
        return pctldev;
 
 out_err:
@@ -641,7 +1069,11 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev)
        if (pctldev == NULL)
                return;
 
-       pinmux_unhog_maps(pctldev);
+       pinctrl_remove_device_debugfs(pctldev);
+       if (!IS_ERR(pctldev->p)) {
+               pinctrl_disable(pctldev->p);
+               pinctrl_put(pctldev->p);
+       }
        /* TODO: check that no pinmuxes are still active? */
        mutex_lock(&pinctrldev_list_mutex);
        list_del(&pctldev->node);
This page took 0.033107 seconds and 5 git commands to generate.