lkml.org 
[lkml]   [2012]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 2/2] pinctrl: add pinctrl_provide_dummies interface for platforms to use
Date
From: Dong Aisheng <dong.aisheng@linaro.org>

Add a interface pinctrl_provide_dummies for platform to indicate
whether it needs use pinctrl dummy state and dummy gpio.

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
---
ChangLog v2->v3:
* Also changed the missed pinctrl gpio APIs in v1.
ChangeLog v1->v2:
* Based on sascha's suggestion, drop using kconfig since it will hide
pinctrl errors on all other boards.
See: https://lkml.org/lkml/2012/4/18/282
It seemed both Linus and Stephen agreed with this way, so i'm ok
with it too.
* add dummy gpio support.
pinctrl gpio in the same situation as state.
* patch name changed.
Original is pinctrl: handle dummy state in core.
* split removing old dt dummy interface into a separate patch
---
drivers/pinctrl/core.c | 46 ++++++++++++++++++++++++++++++++++----
include/linux/pinctrl/machine.h | 5 +++-
2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index ea2412a..2330225 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -43,6 +43,9 @@ struct pinctrl_maps {
unsigned num_maps;
};

+static bool pinctrl_dummy_state;
+static bool pinctrl_dummy_gpio;
+
/* Mutex taken by all entry points */
DEFINE_MUTEX(pinctrl_mutex);

@@ -61,6 +64,17 @@ static LIST_HEAD(pinctrl_maps);
_i_ < _maps_node_->num_maps; \
i++, _map_ = &_maps_node_->maps[_i_])

+/**
+ * pinctrl_provide_dummies() - indicate if provide dummies for state and gpio
+ * @state - provide dummy state
+ * @gpio - provide dummy gpio
+ */
+void pinctrl_provide_dummies(bool state, bool gpio)
+{
+ pinctrl_dummy_state = state;
+ pinctrl_dummy_gpio = gpio;
+}
+
const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev)
{
/* We're not allowed to register devices without name */
@@ -383,7 +397,12 @@ int pinctrl_request_gpio(unsigned gpio)
ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range);
if (ret) {
mutex_unlock(&pinctrl_mutex);
- return ret;
+ if (pinctrl_dummy_gpio) {
+ pr_debug("pinctrl: using dummy gpio(%u)\n", gpio);
+ return 0;
+ } else {
+ return ret;
+ }
}

/* Convert to the pin controllers number space */
@@ -436,8 +455,15 @@ static int pinctrl_gpio_direction(unsigned gpio, bool input)
int pin;

ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range);
- if (ret)
- return ret;
+ if (ret) {
+ if (pinctrl_dummy_gpio) {
+ pr_debug("pinctrl: set dummy gpio(%u) %s\n", gpio,
+ input ? "input" : "output");
+ return 0;
+ } else {
+ return ret;
+ }
+ }

/* Convert to the pin controllers number space */
pin = gpio - range->base + range->pin_base;
@@ -720,8 +746,18 @@ static struct pinctrl_state *pinctrl_lookup_state_locked(struct pinctrl *p,
struct pinctrl_state *state;

state = find_state(p, name);
- if (!state)
- return ERR_PTR(-ENODEV);
+ if (!state) {
+ if (pinctrl_dummy_state) {
+ /* create dummy state */
+ dev_dbg(p->dev, "using pinctrl dummy state (%s)\n",
+ name);
+ state = create_state(p, name);
+ if (IS_ERR(state))
+ return state;
+ } else {
+ return ERR_PTR(-ENODEV);
+ }
+ }

return state;
}
diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h
index e4d1de7..849a844 100644
--- a/include/linux/pinctrl/machine.h
+++ b/include/linux/pinctrl/machine.h
@@ -154,7 +154,7 @@ struct pinctrl_map {

extern int pinctrl_register_mappings(struct pinctrl_map const *map,
unsigned num_maps);
-
+extern void pinctrl_provide_dummies(bool state, bool gpio);
#else

static inline int pinctrl_register_mappings(struct pinctrl_map const *map,
@@ -163,5 +163,8 @@ static inline int pinctrl_register_mappings(struct pinctrl_map const *map,
return 0;
}

+static inline void pinctrl_provide_dummies(bool state, bool gpio)
+{
+}
#endif /* !CONFIG_PINMUX */
#endif
--
1.7.0.4



\
 
 \ /
  Last update: 2012-04-25 13:33    [W:0.062 / U:0.416 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site