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 <georgi.djakov@linaro.org>

diff --cc drivers/interconnect/core.c
Simple merge

diff --cc drivers/interconnect/qcom/osm-l3.c
Simple merge

diff --cc drivers/interconnect/qcom/sc7180.c
Simple merge

diff --cc drivers/interconnect/qcom/sdm845.c
Simple merge

diff --cc include/linux/interconnect-provider.h
index 4d535fddd5d31941d6885afa380940458026eef9,f713308b8a8f42118fedfc9c9d84b291f54e7288..6bd01f7159c6c6719d49a92537504d13fef39707
--- 1/include/linux/interconnect-provider.h
--- 2/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