[U-Boot] [RESENT PATCH 1/2] core: add uclass_get_device_by_phandle_id() api
Add api for who can not get phandle from a device property.
Signed-off-by: Kever Yang kever.yang@rock-chips.com ---
drivers/core/uclass.c | 28 ++++++++++++++++++++++++++++ include/dm/uclass.h | 16 ++++++++++++++++ 2 files changed, 44 insertions(+)
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index f5e4067..dd7a89c 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -443,6 +443,34 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node, }
#if CONFIG_IS_ENABLED(OF_CONTROL) +int uclass_get_device_by_phandle_id(enum uclass_id id, int phandle_id, + struct udevice **devp) +{ + struct udevice *dev; + struct uclass *uc; + int ret; + + *devp = NULL; + ret = uclass_get(id, &uc); + if (ret) + return ret; + + ret = -ENODEV; + list_for_each_entry(dev, &uc->dev_head, uclass_node) { + uint phandle; + + phandle = dev_read_phandle(dev); + + if (phandle == phandle_id) { + *devp = dev; + ret = 0; + break; + } + } + + return uclass_get_device_tail(dev, ret, devp); +} + int uclass_get_device_by_phandle(enum uclass_id id, struct udevice *parent, const char *name, struct udevice **devp) { diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 1818849..f6fe785 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -203,6 +203,22 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node, struct udevice **devp);
/** + * uclass_get_device_by_phandle_id() - Get a uclass device by phandle id + * + * This searches the devices in the uclass for one with the given phandle id. + * + * The device is probed to activate it ready for use. + * + * @id: uclass ID to look up + * @phandle_id: the phandle id to look up + * @devp: Returns pointer to device (there is only one for each node) + * @return 0 if OK, -ENODEV if there is no device match the phandle, other + * -ve on error + */ +int uclass_get_device_by_phandle_id(enum uclass_id id, int phandle_id, + struct udevice **devp); + +/** * uclass_get_device_by_phandle() - Get a uclass device by phandle * * This searches the devices in the uclass for one with the given phandle.
Use live dt interface for pinctrl_select_state_full()
Signed-off-by: Kever Yang kever.yang@rock-chips.com ---
drivers/pinctrl/pinctrl-uclass.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 114952a..5abfeba 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -5,13 +5,13 @@ */
#include <common.h> -#include <libfdt.h> #include <linux/err.h> #include <linux/list.h> #include <dm.h> #include <dm/lists.h> #include <dm/pinctrl.h> #include <dm/util.h> +#include <dm/of_access.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -63,16 +63,13 @@ static int pinctrl_config_one(struct udevice *config) */ static int pinctrl_select_state_full(struct udevice *dev, const char *statename) { - const void *fdt = gd->fdt_blob; - int node = dev_of_offset(dev); char propname[32]; /* long enough */ const fdt32_t *list; uint32_t phandle; - int config_node; struct udevice *config; int state, size, i, ret;
- state = fdt_stringlist_search(fdt, node, "pinctrl-names", statename); + state = dev_read_stringlist_search(dev, "pinctrl-names", statename); if (state < 0) { char *end; /* @@ -85,22 +82,15 @@ static int pinctrl_select_state_full(struct udevice *dev, const char *statename) }
snprintf(propname, sizeof(propname), "pinctrl-%d", state); - list = fdt_getprop(fdt, node, propname, &size); + list = dev_read_prop(dev, propname, &size); if (!list) return -EINVAL;
size /= sizeof(*list); for (i = 0; i < size; i++) { phandle = fdt32_to_cpu(*list++); - - config_node = fdt_node_offset_by_phandle(fdt, phandle); - if (config_node < 0) { - dev_err(dev, "prop %s index %d invalid phandle\n", - propname, i); - return -EINVAL; - } - ret = uclass_get_device_by_of_offset(UCLASS_PINCONFIG, - config_node, &config); + ret = uclass_get_device_by_phandle_id(UCLASS_PINCONFIG, phandle, + &config); if (ret) return ret;
On 8 Feb 2018, at 14:13, Kever Yang kever.yang@rock-chips.com wrote:
Add api for who can not get phandle from a device property.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
See below for comments.
drivers/core/uclass.c | 28 ++++++++++++++++++++++++++++ include/dm/uclass.h | 16 ++++++++++++++++ 2 files changed, 44 insertions(+)
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index f5e4067..dd7a89c 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -443,6 +443,34 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node, }
#if CONFIG_IS_ENABLED(OF_CONTROL) +int uclass_get_device_by_phandle_id(enum uclass_id id, int phandle_id,
struct udevice **devp)+{
- struct udevice *dev;
- struct uclass *uc;
- int ret;
- *devp = NULL;
- ret = uclass_get(id, &uc);
- if (ret)
return ret;- ret = -ENODEV;
- list_for_each_entry(dev, &uc->dev_head, uclass_node) {
uint phandle;phandle = dev_read_phandle(dev);if (phandle == phandle_id) {*devp = dev;ret = 0;break;
I would prefer if you directly called into the tail here… …and didn’t set "ret = -ENODEV” above and returned the -ENODEV directly from below.
In other words, you could have return uclass_get_device_tail(dev, 0, devp); here.
}- }
- return uclass_get_device_tail(dev, ret, devp);
+}
int uclass_get_device_by_phandle(enum uclass_id id, struct udevice *parent, const char *name, struct udevice **devp) { diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 1818849..f6fe785 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -203,6 +203,22 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node, struct udevice **devp);
/**
- uclass_get_device_by_phandle_id() - Get a uclass device by phandle id
- This searches the devices in the uclass for one with the given phandle id.
- The device is probed to activate it ready for use.
- @id: uclass ID to look up
- @phandle_id: the phandle id to look up
- @devp: Returns pointer to device (there is only one for each node)
- @return 0 if OK, -ENODEV if there is no device match the phandle, other
- -ve on error
- */
+int uclass_get_device_by_phandle_id(enum uclass_id id, int phandle_id,
struct udevice **devp);+/**
- uclass_get_device_by_phandle() - Get a uclass device by phandle
- This searches the devices in the uclass for one with the given phandle.
-- 1.9.1
participants (2)
-
Dr. Philipp Tomsich -
Kever Yang