mux: add devm_mux_state_get_from_np() to get mux from child node

Add new API devm_mux_state_get_from_np() to retrieve a mux control from
a specified child device node.

Make devm_mux_state_get() call devm_mux_state_get_from_np() with a NULL
node parameter, which defaults to using the device's own of_node.

Support the following DT schema:

pinctrl@0 {
    uart-func {
            mux-state = <&mux_chip 0>;
    };

    spi-func {
            mux-state = <&mux_chip 1>;
    };
};

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Linus Walleij <linusw@kernel.org>

diff --git a/drivers/mux/core.c b/drivers/mux/core.c
index 23538de2c91b41ad998471d5af429cf3c6211e4e..2f01acfccf47b1a55037a29101951f4b1760d890 100644 (file)
--- a/drivers/mux/core.c
+++ b/drivers/mux/core.c
@@ -533,14 +533,16 @@ static struct mux_chip *of_find_mux_chip_by_node(struct device_node *np)
  * @state: Pointer to where the requested state is returned, or NULL when
  *         the required multiplexer states are handled by other means.
  * @optional: Whether to return NULL and silence errors when mux doesn't exist.
+ * @node: the device nodes, use dev->of_node if it is NULL.
  *
  * Return: Pointer to the mux-control on success, an ERR_PTR with a negative
  * errno on error, or NULL if optional is true and mux doesn't exist.
  */
 static struct mux_control *mux_get(struct device *dev, const char *mux_name,
-                                  unsigned int *state, bool optional)
+                                  unsigned int *state, bool optional,
+                                  struct device_node *node)
 {
-       struct device_node *np = dev->of_node;
+       struct device_node *np = node ? node : dev->of_node;
        struct of_phandle_args args;
        struct mux_chip *mux_chip;
        unsigned int controller;
@@ -635,7 +637,7 @@ static struct mux_control *mux_get(struct device *dev, const char *mux_name,
  */
 struct mux_control *mux_control_get(struct device *dev, const char *mux_name)
 {
-       struct mux_control *mux = mux_get(dev, mux_name, NULL, false);
+       struct mux_control *mux = mux_get(dev, mux_name, NULL, false, NULL);
 
        if (!mux)
                return ERR_PTR(-ENOENT);
@@ -654,7 +656,7 @@ EXPORT_SYMBOL_GPL(mux_control_get);
  */
 struct mux_control *mux_control_get_optional(struct device *dev, const char *mux_name)
 {
-       return mux_get(dev, mux_name, NULL, true);
+       return mux_get(dev, mux_name, NULL, true, NULL);
 }
 EXPORT_SYMBOL_GPL(mux_control_get_optional);
 
@@ -712,11 +714,14 @@ EXPORT_SYMBOL_GPL(devm_mux_control_get);
  * @dev: The device that needs a mux-state.
  * @mux_name: The name identifying the mux-state.
  * @optional: Whether to return NULL and silence errors when mux doesn't exist.
+ * @np: the device nodes, use dev->of_node if it is NULL.
  *
  * Return: Pointer to the mux-state on success, an ERR_PTR with a negative
  * errno on error, or NULL if optional is true and mux doesn't exist.
  */
-static struct mux_state *mux_state_get(struct device *dev, const char *mux_name, bool optional)
+static struct mux_state *
+mux_state_get(struct device *dev, const char *mux_name, bool optional,
+             struct device_node *np)
 {
        struct mux_state *mstate;
 
@@ -724,7 +729,7 @@ static struct mux_state *mux_state_get(struct device *dev, const char *mux_name,
        if (!mstate)
                return ERR_PTR(-ENOMEM);
 
-       mstate->mux = mux_get(dev, mux_name, &mstate->state, optional);
+       mstate->mux = mux_get(dev, mux_name, &mstate->state, optional, np);
        if (IS_ERR(mstate->mux)) {
                int err = PTR_ERR(mstate->mux);
 
@@ -773,7 +778,7 @@ static void devm_mux_state_release(struct device *dev, void *res)
  * errno on error, or NULL if optional is true and mux doesn't exist.
  */
 static struct mux_state *__devm_mux_state_get(struct device *dev, const char *mux_name,
-                                             bool optional,
+                                             bool optional, struct device_node *np,
                                              int (*init)(struct mux_state *mstate),
                                              int (*exit)(struct mux_state *mstate))
 {
@@ -781,7 +786,7 @@ static struct mux_state *__devm_mux_state_get(struct device *dev, const char *mu
        struct mux_state *mstate;
        int ret;
 
-       mstate = mux_state_get(dev, mux_name, optional);
+       mstate = mux_state_get(dev, mux_name, optional, np);
        if (IS_ERR(mstate))
                return ERR_CAST(mstate);
        else if (optional && !mstate)
@@ -815,20 +820,23 @@ err_devres_alloc:
 }
 
 /**
- * devm_mux_state_get() - Get the mux-state for a device, with resource
- *                       management.
+ * devm_mux_state_get_from_np() - Get the mux-state for a device, with resource
+ *                               management.
  * @dev: The device that needs a mux-control.
  * @mux_name: The name identifying the mux-control.
+ * @np: the device nodes, use dev->of_node if it is NULL.
  *
  * Return: Pointer to the mux-state, or an ERR_PTR with a negative errno.
  *
  * The mux-state will automatically be freed on release.
  */
-struct mux_state *devm_mux_state_get(struct device *dev, const char *mux_name)
+struct mux_state *
+devm_mux_state_get_from_np(struct device *dev, const char *mux_name,
+                          struct device_node *np)
 {
-       return __devm_mux_state_get(dev, mux_name, false, NULL, NULL);
+       return __devm_mux_state_get(dev, mux_name, false, np, NULL, NULL);
 }
-EXPORT_SYMBOL_GPL(devm_mux_state_get);
+EXPORT_SYMBOL_GPL(devm_mux_state_get_from_np);
 
 /**
  * devm_mux_state_get_optional() - Get the optional mux-state for a device,
@@ -843,7 +851,7 @@ EXPORT_SYMBOL_GPL(devm_mux_state_get);
  */
 struct mux_state *devm_mux_state_get_optional(struct device *dev, const char *mux_name)
 {
-       return __devm_mux_state_get(dev, mux_name, true, NULL, NULL);
+       return __devm_mux_state_get(dev, mux_name, true, NULL, NULL, NULL);
 }
 EXPORT_SYMBOL_GPL(devm_mux_state_get_optional);
 
@@ -861,7 +869,8 @@ EXPORT_SYMBOL_GPL(devm_mux_state_get_optional);
  */
 struct mux_state *devm_mux_state_get_selected(struct device *dev, const char *mux_name)
 {
-       return __devm_mux_state_get(dev, mux_name, false, mux_state_select, mux_state_deselect);
+       return __devm_mux_state_get(dev, mux_name, false, NULL,
+                                   mux_state_select, mux_state_deselect);
 }
 EXPORT_SYMBOL_GPL(devm_mux_state_get_selected);
 
@@ -881,7 +890,8 @@ EXPORT_SYMBOL_GPL(devm_mux_state_get_selected);
 struct mux_state *devm_mux_state_get_optional_selected(struct device *dev,
                                                       const char *mux_name)
 {
-       return __devm_mux_state_get(dev, mux_name, true, mux_state_select, mux_state_deselect);
+       return __devm_mux_state_get(dev, mux_name, true, NULL,
+                                   mux_state_select, mux_state_deselect);
 }
 EXPORT_SYMBOL_GPL(devm_mux_state_get_optional_selected);
 

diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
index a961861a503b33a3ea18aee6a2eb044866aa8801..449e38e6e2c515b3dd2b51a8b8cf0295a2520804 100644 (file)
--- a/include/linux/mux/consumer.h
+++ b/include/linux/mux/consumer.h
@@ -60,7 +60,10 @@ struct mux_control *mux_control_get_optional(struct device *dev, const char *mux
 void mux_control_put(struct mux_control *mux);
 
 struct mux_control *devm_mux_control_get(struct device *dev, const char *mux_name);
-struct mux_state *devm_mux_state_get(struct device *dev, const char *mux_name);
+
+struct mux_state *
+devm_mux_state_get_from_np(struct device *dev, const char *mux_name, struct device_node *np);
+
 struct mux_state *devm_mux_state_get_optional(struct device *dev, const char *mux_name);
 struct mux_state *devm_mux_state_get_selected(struct device *dev, const char *mux_name);
 struct mux_state *devm_mux_state_get_optional_selected(struct device *dev, const char *mux_name);
@@ -161,4 +164,7 @@ static inline struct mux_state *devm_mux_state_get_optional_selected(struct devi
 
 #endif /* CONFIG_MULTIPLEXER */
 
+#define devm_mux_state_get(dev, mux_name)              \
+       devm_mux_state_get_from_np(dev, mux_name, NULL)
+
 #endif /* _LINUX_MUX_CONSUMER_H */