Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinmux.c

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 88cc5095d0c96c6429c9e9eec183b078bc31ef29..9d144a263dc2a3e5e11f98a6502b234050aca066 100644 (file)
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -400,10 +400,14 @@ int pinmux_enable_setting(struct pinctrl_setting const *setting)
        ret = pctlops->get_group_pins(pctldev, setting->data.mux.group,
                                      &pins, &num_pins);
        if (ret) {
+               const char *gname;
+
                /* errors only affect debug data, so just warn */
+               gname = pctlops->get_group_name(pctldev,
+                                               setting->data.mux.group);
                dev_warn(pctldev->dev,
-                        "could not get pins for group selector %d\n",
-                        setting->data.mux.group);
+                        "could not get pins for group %s\n",
+                        gname);
                num_pins = 0;
        }
 
@@ -411,9 +415,18 @@ int pinmux_enable_setting(struct pinctrl_setting const *setting)
        for (i = 0; i < num_pins; i++) {
                ret = pin_request(pctldev, pins[i], setting->dev_name, NULL);
                if (ret) {
+                       const char *gname;
+                       const char *pname;
+
+                       desc = pin_desc_get(pctldev, pins[i]);
+                       pname = desc ? desc->name : "non-existing";
+                       gname = pctlops->get_group_name(pctldev,
+                                               setting->data.mux.group);
                        dev_err(pctldev->dev,
-                               "could not request pin %d on device %s\n",
-                               pins[i], pinctrl_dev_get_name(pctldev));
+                               "could not request pin %d (%s) from group %s "
+                               " on device %s\n",
+                               pins[i], pname, gname,
+                               pinctrl_dev_get_name(pctldev));
                        goto err_pin_request;
                }
        }
@@ -466,10 +479,14 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting)
        ret = pctlops->get_group_pins(pctldev, setting->data.mux.group,
                                      &pins, &num_pins);
        if (ret) {
+               const char *gname;
+
                /* errors only affect debug data, so just warn */
+               gname = pctlops->get_group_name(pctldev,
+                                               setting->data.mux.group);
                dev_warn(pctldev->dev,
-                        "could not get pins for group selector %d\n",
-                        setting->data.mux.group);
+                        "could not get pins for group %s\n",
+                        gname);
                num_pins = 0;
        }
 
@@ -482,12 +499,24 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting)
                                 pins[i]);
                        continue;
                }
-               desc->mux_setting = NULL;
-       }
+               if (desc->mux_setting == &(setting->data.mux)) {
+                       desc->mux_setting = NULL;
+                       /* And release the pin */
+                       pin_free(pctldev, pins[i], NULL);
+               } else {
+                       const char *gname;
+                       const char *pname;
 
-       /* And release the pins */
-       for (i = 0; i < num_pins; i++)
-               pin_free(pctldev, pins[i], NULL);
+                       pname = desc ? desc->name : "non-existing";
+                       gname = pctlops->get_group_name(pctldev,
+                                               setting->data.mux.group);
+                       dev_warn(pctldev->dev,
+                                "not freeing pin %d (%s) as part of "
+                                "deactivating group %s - it is already "
+                                "used for some other setting",
+                                pins[i], pname, gname);
+               }
+       }
 
        if (ops->disable)
                ops->disable(pctldev, setting->data.mux.func, setting->data.mux.group);