summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Muellner <christoph.muellner@theobroma-systems.com>2019-01-02 15:09:18 +0100
committerPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2019-01-02 22:38:44 +0100
commit5ff776889212c080e3d1a33634ac904405ed6845 (patch)
tree836c2cf8fece6fc3aed29e7c5fbbfc7a15cd676a
parent4de2bbb39ea71d28bc422b9405f199b3abe4b8fa (diff)
dm: pinctrl: Add pinctrl_decode_pin_config_dm().
pinctrl_decode_pin_config_dm() is basically a feature-equivalent implementation of pinctrl_decode_pin_config(), which operates on struct udevice devices and uses the dev_read_*() API. Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
-rw-r--r--drivers/pinctrl/pinctrl-uclass.c22
-rw-r--r--include/dm/pinctrl.h12
2 files changed, 34 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index 29c910c55f..c8b38d78f6 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -27,6 +27,28 @@ int pinctrl_decode_pin_config(const void *blob, int node)
return flags;
}
+/*
+ * TODO: this function is temporary for v2019.01.
+ * It should be renamed to pinctrl_decode_pin_config(),
+ * the original pinctrl_decode_pin_config() function should
+ * be removed and all callers of the original function should
+ * be migrated to use the new one.
+ */
+int pinctrl_decode_pin_config_dm(struct udevice *dev)
+{
+ int pinconfig = 0;
+
+ if (dev->uclass->uc_drv->id != UCLASS_PINCONFIG)
+ return -EINVAL;
+
+ if (dev_read_bool(dev, "bias-pull-up"))
+ pinconfig |= 1 << PIN_CONFIG_BIAS_PULL_UP;
+ else if (dev_read_bool(dev, "bias-pull-down"))
+ pinconfig |= 1 << PIN_CONFIG_BIAS_PULL_DOWN;
+
+ return pinconfig;
+}
+
#if CONFIG_IS_ENABLED(PINCTRL_FULL)
/**
* pinctrl_config_one() - apply pinctrl settings for a single node
diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h
index 63a7d55b88..ff2b82e7c2 100644
--- a/include/dm/pinctrl.h
+++ b/include/dm/pinctrl.h
@@ -355,6 +355,18 @@ int pinctrl_get_periph_id(struct udevice *dev, struct udevice *periph);
int pinctrl_decode_pin_config(const void *blob, int node);
/**
+ * pinctrl_decode_pin_config_dm() - decode pin configuration flags
+ *
+ * This decodes some of the PIN_CONFIG values into flags, with each value
+ * being (1 << pin_cfg). This does not support things with values like the
+ * slew rate.
+ *
+ * @pinconfig: Pinconfig udevice
+ * @return decoded flag value, or -ve on error
+ */
+int pinctrl_decode_pin_config_dm(struct udevice *dev);
+
+/**
* pinctrl_get_gpio_mux() - get the mux value for a particular GPIO
*
* This allows the raw mux value for a GPIO to be obtained. It is