[U-Boot] [PATCH v2 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 ---
Changes in v2: - use uint instead of int for phandle - address comment from Philipp
drivers/core/uclass.c | 26 ++++++++++++++++++++++++++ include/dm/uclass.h | 16 ++++++++++++++++ 2 files changed, 42 insertions(+)
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index f5e4067..274b833 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -443,6 +443,32 @@ 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, uint phandle_id, + struct udevice **devp) +{ + struct udevice *dev; + struct uclass *uc; + int ret; + + *devp = NULL; + ret = uclass_get(id, &uc); + if (ret) + return ret; + + list_for_each_entry(dev, &uc->dev_head, uclass_node) { + uint phandle; + + phandle = dev_read_phandle(dev); + + if (phandle == phandle_id) { + *devp = dev; + return uclass_get_device_tail(dev, ret, devp); + } + } + + return -ENODEV; +} + 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..63cb6e9 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, uint 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 ---
Changes in v2: None
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;
Use live dt interface for pinctrl_select_state_full()
Signed-off-by: Kever Yang kever.yang@rock-chips.com
Changes in v2: None
drivers/pinctrl/pinctrl-uclass.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
On 9 February 2018 at 18:15, Philipp Tomsich philipp.tomsich@theobroma-systems.com wrote:
Use live dt interface for pinctrl_select_state_full()
Signed-off-by: Kever Yang kever.yang@rock-chips.com
Changes in v2: None
drivers/pinctrl/pinctrl-uclass.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Applied to u-boot-dm, thanks!
Add api for who can not get phandle from a device property.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
Changes in v2:
- use uint instead of int for phandle
- address comment from Philipp
drivers/core/uclass.c | 26 ++++++++++++++++++++++++++ include/dm/uclass.h | 16 ++++++++++++++++ 2 files changed, 42 insertions(+)
Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Hi Kever,
On 8 February 2018 at 19:56, Kever Yang kever.yang@rock-chips.com wrote:
Add api for who can not get phandle from a device property.
Can you please add a motivation to the commit message? It is not obvious to me when this function would be used.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
Changes in v2:
- use uint instead of int for phandle
- address comment from Philipp
drivers/core/uclass.c | 26 ++++++++++++++++++++++++++ include/dm/uclass.h | 16 ++++++++++++++++ 2 files changed, 42 insertions(+)
Regards, Simon
Hi Simon,
On 02/12/2018 10:35 PM, Simon Glass wrote:
Hi Kever,
On 8 February 2018 at 19:56, Kever Yang kever.yang@rock-chips.com wrote:
Add api for who can not get phandle from a device property.
Can you please add a motivation to the commit message? It is not obvious to me when this function would be used.
Here is the example why I need this, see the dts node here: lvds@ff2e0000 { ... rockchip,grf = <&grf>; port { port@0 { endpoint@0 { remote-endpoint = <&vopl_out_lvds>; } } } }
We can only get 'grf' udevice by uclass_get_device_by_phandle(), but we not able to get udevice 'vopl_out_lvds', other driver like rockchip pinctrl also need to get udevice by a phandle which is not one of direct property of another device node.
Thanks, - Kever
Signed-off-by: Kever Yang kever.yang@rock-chips.com
Changes in v2:
- use uint instead of int for phandle
- address comment from Philipp
drivers/core/uclass.c | 26 ++++++++++++++++++++++++++ include/dm/uclass.h | 16 ++++++++++++++++ 2 files changed, 42 insertions(+)
Regards, Simon
Hi Kever,
On 23 February 2018 at 19:08, Kever Yang kever.yang@rock-chips.com wrote:
Hi Simon,
On 02/12/2018 10:35 PM, Simon Glass wrote:
Hi Kever,
On 8 February 2018 at 19:56, Kever Yang kever.yang@rock-chips.com wrote:
Add api for who can not get phandle from a device property.
Can you please add a motivation to the commit message? It is not obvious to me when this function would be used.
Here is the example why I need this, see the dts node here: lvds@ff2e0000 { ... rockchip,grf = <&grf>; port { port@0 { endpoint@0 { remote-endpoint = <&vopl_out_lvds>; } } } }
We can only get 'grf' udevice by uclass_get_device_by_phandle(), but we not able to get udevice 'vopl_out_lvds', other driver like rockchip pinctrl also need to get udevice by a phandle which is not one of direct property of another device node.
OK I see. This sort of info is useful in the commit message. It helps to know two things about a patch:
- why it is needed - what it does
In this case see rk_display_init() for how it handles the 'remote-endpoint' property. I think it would be better to have something like:
ofnode ofnode_lookup_phandle(ofnode node, const char *prop_name);
This should meet your needs without needing to decoding the phandle property in the caller.
Regards, Simon
Hi Simon,
On 02/25/2018 11:54 PM, Simon Glass wrote:
Hi Kever,
On 23 February 2018 at 19:08, Kever Yang kever.yang@rock-chips.com wrote:
Hi Simon,
On 02/12/2018 10:35 PM, Simon Glass wrote:
Hi Kever,
On 8 February 2018 at 19:56, Kever Yang kever.yang@rock-chips.com wrote:
Add api for who can not get phandle from a device property.
Can you please add a motivation to the commit message? It is not obvious to me when this function would be used.
Here is the example why I need this, see the dts node here: lvds@ff2e0000 { ... rockchip,grf = <&grf>; port { port@0 { endpoint@0 { remote-endpoint = <&vopl_out_lvds>; } } } }
We can only get 'grf' udevice by uclass_get_device_by_phandle(), but we not able to get udevice 'vopl_out_lvds', other driver like rockchip pinctrl also need to get udevice by a phandle which is not one of direct property of another device node.
OK I see. This sort of info is useful in the commit message. It helps to know two things about a patch:
- why it is needed
- what it does
In this case see rk_display_init() for how it handles the 'remote-endpoint' property. I think it would be better to have something like:
ofnode ofnode_lookup_phandle(ofnode node, const char *prop_name);
Yes, this is enough for "remote-endpoint" case, but not for pinctrl case: 1199 pinctrl: pinctrl { 2095 pwm0 { 2096 pwm0_pin: pwm0-pin { 2097 rockchip,pins = 2098 <0 RK_PB7 RK_FUNC_1 &pcfg_pull_none>; 2099 }; 2100 };
I think ofnode_lookup_phandle() still not able to find node for 'pcfg_pull_none'.
Thanks, - Kever
This should meet your needs without needing to decoding the phandle property in the caller.
Regards, Simon
Kever,
On 26 Feb 2018, at 04:07, Kever Yang kever.yang@rock-chips.com wrote:
Hi Simon,
On 02/25/2018 11:54 PM, Simon Glass wrote:
Hi Kever,
On 23 February 2018 at 19:08, Kever Yang kever.yang@rock-chips.com wrote:
Hi Simon,
On 02/12/2018 10:35 PM, Simon Glass wrote:
Hi Kever,
On 8 February 2018 at 19:56, Kever Yang kever.yang@rock-chips.com wrote:
Add api for who can not get phandle from a device property.
Can you please add a motivation to the commit message? It is not obvious to me when this function would be used.
Here is the example why I need this, see the dts node here: lvds@ff2e0000 { ... rockchip,grf = <&grf>; port { port@0 { endpoint@0 { remote-endpoint = <&vopl_out_lvds>; } } } }
We can only get 'grf' udevice by uclass_get_device_by_phandle(), but we not able to get udevice 'vopl_out_lvds', other driver like rockchip pinctrl also need to get udevice by a phandle which is not one of direct property of another device node.
OK I see. This sort of info is useful in the commit message. It helps to know two things about a patch:
- why it is needed
- what it does
In this case see rk_display_init() for how it handles the 'remote-endpoint' property. I think it would be better to have something like:
ofnode ofnode_lookup_phandle(ofnode node, const char *prop_name);
Yes, this is enough for "remote-endpoint" case, but not for pinctrl case: 1199 pinctrl: pinctrl { 2095 pwm0 { 2096 pwm0_pin: pwm0-pin { 2097 rockchip,pins = 2098 <0 RK_PB7 RK_FUNC_1 &pcfg_pull_none>; 2099 }; 2100 };
I think ofnode_lookup_phandle() still not able to find node for 'pcfg_pull_none’.
I had to convert rk_vop to livetree last week to fix a regression on HDMI for our RK3399-Q7. In doing so, I created some code to “walk the tree to find a parent with a given uclass) … this had me introduce an new ofnode_get_parent() function.
Anatolij merged this on the weekend and it’s on Tom’s master already.
Best, Philipp.
Thanks,
- Kever
This should meet your needs without needing to decoding the phandle property in the caller.
Regards, Simon
Applied to u-boot-dm, thanks!
participants (4)
-
Dr. Philipp Tomsich -
Kever Yang -
Philipp Tomsich
-
Simon Glass