Commit d83ea024 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'icc-5.18-rc6' of...

Merge tag 'icc-5.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-linus

Pull interconnect fixes from Georgi:
 "interconnect fixes for v5.18-rc

  This contains an additional fix for sc7180 and sdx55 platforms that helps
  them to enter suspend even on devices that don't have the most recent DT
  changes.

  - interconnect: Restore sync state by ignoring ipa-virt in provider count

  Signed-off-by: Georgi Djakov <djakov@kernel.org>"

* tag 'icc-5.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: Restore sync state by ignoring ipa-virt in provider count
parents fe503887 20ce30fb
...@@ -1087,9 +1087,15 @@ static int of_count_icc_providers(struct device_node *np) ...@@ -1087,9 +1087,15 @@ static int of_count_icc_providers(struct device_node *np)
{ {
struct device_node *child; struct device_node *child;
int count = 0; int count = 0;
const struct of_device_id __maybe_unused ignore_list[] = {
{ .compatible = "qcom,sc7180-ipa-virt" },
{ .compatible = "qcom,sdx55-ipa-virt" },
{}
};
for_each_available_child_of_node(np, child) { for_each_available_child_of_node(np, child) {
if (of_property_read_bool(child, "#interconnect-cells")) if (of_property_read_bool(child, "#interconnect-cells") &&
likely(!of_match_node(ignore_list, child)))
count++; count++;
count += of_count_icc_providers(child); count += of_count_icc_providers(child);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment