summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-02-20 07:45:51 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-02-22 17:59:34 +0100
commitf026fe3d102e9d7f0d040109353ef5a97b5ef92c (patch)
tree721b39699b68b66d361e4bc8cadc90ed56c45a94 /drivers
parentpinctrl: assume map table entries can't have a NULL ctrl_dev_name field (diff)
downloadlinux-f026fe3d102e9d7f0d040109353ef5a97b5ef92c.tar.xz
linux-f026fe3d102e9d7f0d040109353ef5a97b5ef92c.zip
pinctrl: downgrade pinctrl_get warning when no maps are found
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. Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Stephen Warren <swarren@nvidia.com> [rebased to fit the applied patch series] Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pinctrl/core.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 552d8c115c4f..e2d4abb29d1a 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -567,14 +567,16 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev, const char *name)
}
}
- /* We should have atleast one map, right */
- if (!num_maps) {
- pr_err("could not find any mux maps for device %s, ID %s\n",
- devname ? devname : "(anonymous)",
- name ? name : "(undefined)");
- kfree(p);
- return ERR_PTR(-EINVAL);
- }
+ /*
+ * 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);
pr_debug("found %u mux maps for device %s, UD %s\n",
num_maps,