From: Georgi Djakov Date: Fri, 18 Sep 2020 06:12:40 +0000 (+0300) Subject: Merge branch 'icc-syncstate' into icc-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=628fdbcf9d665ab68f5493936ca23383a5844ff7;p=linux.git Merge branch 'icc-syncstate' into icc-next * icc-syncstate: interconnect: Add get_bw() callback interconnect: Add sync state support interconnect: qcom: Use icc_sync_state Signed-off-by: Georgi Djakov --- 628fdbcf9d665ab68f5493936ca23383a5844ff7 diff --cc include/linux/interconnect-provider.h index 4d535fddd5d31,f713308b8a8f4..6bd01f7159c6c --- a/include/linux/interconnect-provider.h +++ b/include/linux/interconnect-provider.h @@@ -49,8 -38,8 +49,9 @@@ struct icc_node *of_icc_xlate_onecell(s * @aggregate: pointer to device specific aggregate operation function * @pre_aggregate: pointer to device specific function that is called * before the aggregation begins (optional) + * @get_bw: pointer to device specific function to get current bandwidth * @xlate: provider-specific callback for mapping nodes from phandle arguments + * @xlate_extended: vendor-specific callback for mapping node data from phandle arguments * @dev: the device this interconnect provider belongs to * @users: count of active users * @inter_set: whether inter-provider pairs will be configured with @set @@@ -63,8 -52,8 +64,9 @@@ struct icc_provider int (*aggregate)(struct icc_node *node, u32 tag, u32 avg_bw, u32 peak_bw, u32 *agg_avg, u32 *agg_peak); void (*pre_aggregate)(struct icc_node *node); + int (*get_bw)(struct icc_node *node, u32 *avg, u32 *peak); struct icc_node* (*xlate)(struct of_phandle_args *spec, void *data); + struct icc_node_data* (*xlate_extended)(struct of_phandle_args *spec, void *data); struct device *dev; int users; bool inter_set; @@@ -118,7 -111,8 +124,8 @@@ void icc_node_del(struct icc_node *node int icc_nodes_remove(struct icc_provider *provider); int icc_provider_add(struct icc_provider *provider); int icc_provider_del(struct icc_provider *provider); -struct icc_node *of_icc_get_from_provider(struct of_phandle_args *spec); +struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec); + void icc_sync_state(struct device *dev); #else