From c36f8b2d07a42a54ca0d016df39cf2592b6838dc Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 6 Jun 2017 12:37:41 +0300 Subject: [PATCH] UPSTREAM: device property: Add fwnode_graph_get_port_parent Provide a helper to obtain the parent device fwnode without first parsing the remote-endpoint as per fwnode_graph_get_remote_port_parent. Signed-off-by: Kieran Bingham Signed-off-by: Sakari Ailus Reviewed-by: Mika Westerberg Signed-off-by: Rafael J. Wysocki (cherry picked from commit 6a71d8d77795e0f7d887baa95bfc0d1d2bc74899) Signed-off-by: Brian J Lovin BUG=b:64133998 TEST=media device topology shows subdevs registered successfully TEST=no camera regression Change-Id: I58c0cfd2759aa62ada3d54cfb77f449ff8a0abc3 Reviewed-on: https://chromium-review.googlesource.com/693680 Commit-Ready: Tomasz Figa Tested-by: Hyungwoo Yang Reviewed-by: Tomasz Figa Signed-off-by: Jacob Chen --- drivers/base/property.c | 28 ++++++++++++++++++++++++---- include/linux/property.h | 2 ++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index 803b878b66f0..4e105096c47e 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1097,6 +1097,26 @@ fwnode_graph_get_next_endpoint(struct fwnode_handle *fwnode, } EXPORT_SYMBOL_GPL(fwnode_graph_get_next_endpoint); +/** + * fwnode_graph_get_port_parent - Return the device fwnode of a port endpoint + * @endpoint: Endpoint firmware node of the port + * + * Return: the firmware node of the device the @endpoint belongs to. + */ +struct fwnode_handle * +fwnode_graph_get_port_parent(struct fwnode_handle *endpoint) +{ + struct fwnode_handle *port, *parent; + + port = fwnode_get_parent(endpoint); + parent = fwnode_call_ptr_op(port, graph_get_port_parent); + + fwnode_handle_put(port); + + return parent; +} +EXPORT_SYMBOL_GPL(fwnode_graph_get_port_parent); + /** * fwnode_graph_get_remote_port_parent - Return fwnode of a remote device * @fwnode: Endpoint firmware node pointing to the remote endpoint @@ -1106,12 +1126,12 @@ EXPORT_SYMBOL_GPL(fwnode_graph_get_next_endpoint); struct fwnode_handle * fwnode_graph_get_remote_port_parent(struct fwnode_handle *fwnode) { - struct fwnode_handle *port, *parent; + struct fwnode_handle *endpoint, *parent; - port = fwnode_graph_get_remote_port(fwnode); - parent = fwnode_call_ptr_op(port, graph_get_port_parent); + endpoint = fwnode_graph_get_remote_endpoint(fwnode); + parent = fwnode_graph_get_port_parent(endpoint); - fwnode_handle_put(port); + fwnode_handle_put(endpoint); return parent; } diff --git a/include/linux/property.h b/include/linux/property.h index ba069ae89e87..30e62f19ae73 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -216,6 +216,8 @@ void *device_get_mac_address(struct device *dev, char *addr, int alen); struct fwnode_handle *fwnode_graph_get_next_endpoint( struct fwnode_handle *fwnode, struct fwnode_handle *prev); +struct fwnode_handle * +fwnode_graph_get_port_parent(struct fwnode_handle *fwnode); struct fwnode_handle *fwnode_graph_get_remote_port_parent( struct fwnode_handle *fwnode); struct fwnode_handle *fwnode_graph_get_remote_port(