diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-13 16:15:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-13 16:15:28 +0200 |
| commit | d83ea024091e11d384f983f389a7853312c33c5d (patch) | |
| tree | 173feb2059ec6c93e2214a3de75c8b7bf4583925 | |
| parent | slimbus: qcom: Fix IRQ check in qcom_slim_probe (diff) | |
| parent | interconnect: Restore sync state by ignoring ipa-virt in provider count (diff) | |
| download | linux-d83ea024091e11d384f983f389a7853312c33c5d.tar.xz linux-d83ea024091e11d384f983f389a7853312c33c5d.zip | |
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
| -rw-r--r-- | drivers/interconnect/core.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 9050ca1f4285..808f6e7a8048 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -1087,9 +1087,15 @@ static int of_count_icc_providers(struct device_node *np) { struct device_node *child; 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) { - 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 += of_count_icc_providers(child); } |