From 5f84d90cee43de35192a4415f0dd1b21b97c549d Mon Sep 17 00:00:00 2001 From: Maulik Shah Date: Fri, 8 Jul 2022 13:56:29 +0530 Subject: [PATCH 1/3] Revert "ARM: dts: msm: Add support to get AOSD sleep stats for kalama" MSG_RAM is updated with AOSD sleep stats. Read from MSG_RAM instead from PDC registers. This reverts commit 28d0a71b13f41f5062042b69d742b0a3b2a04cd8. Change-Id: Ie17b38dd04ca3fb39a1b9fa6be286a55c6cc52a6 --- qcom/kalama.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qcom/kalama.dtsi b/qcom/kalama.dtsi index 031cbae5..d7998a27 100644 --- a/qcom/kalama.dtsi +++ b/qcom/kalama.dtsi @@ -2624,8 +2624,8 @@ }; soc-sleep-stats@c3f0000 { - compatible = "qcom,rpmh-sleep-stats-v2"; - reg = <0xc3f0000 0x400>, <0xb261400 0x100>; + compatible = "qcom,rpmh-sleep-stats"; + reg = <0xc3f0000 0x400>; ss-name = "modem", "adsp", "adsp_island", "cdsp", "apss"; mboxes = <&qmp_aop 0>; @@ -2639,8 +2639,8 @@ }; subsystem-sleep-stats@c3f0000 { - compatible = "qcom,subsystem-sleep-stats-v2"; - reg = <0xc3f0000 0x400>, <0xb261400 0x100>; + compatible = "qcom,subsystem-sleep-stats"; + reg = <0xc3f0000 0x400>; ddr-freq-update; }; From 94fb0efc7194ac82b45017e009ec330888e82f37 Mon Sep 17 00:00:00 2001 From: Maulik Shah Date: Fri, 8 Jul 2022 13:57:51 +0530 Subject: [PATCH 2/3] Revert "dt-bindings: soc_sleep_stats: Add new compatible to get AOSD sleep stats" MSG_RAM is updated with AOSD sleep stats. Read from MSG_RAM instead from PDC registers. This reverts commit bf6b9acd36d9041ecfa1f0fa21fcee21dd99ac5e. Change-Id: I02c9063bb37fb54ff857aa003355e58e7fe5ade3 --- bindings/soc/qcom/soc-sleep-stats.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/bindings/soc/qcom/soc-sleep-stats.yaml b/bindings/soc/qcom/soc-sleep-stats.yaml index db66f4b2..3edb0280 100644 --- a/bindings/soc/qcom/soc-sleep-stats.yaml +++ b/bindings/soc/qcom/soc-sleep-stats.yaml @@ -21,11 +21,10 @@ properties: enum: - qcom,rpmh-sleep-stats-legacy - qcom,rpmh-sleep-stats - - qcom,rpmh-sleep-stats-v2 - qcom,rpm-sleep-stats reg: - maxItems: 2 + maxItems: 1 ss-name: $ref: /schemas/types.yaml#/definitions/string @@ -76,16 +75,6 @@ examples: mboxes = <&qmp_aop 0>; ddr-freq-update; }; - # Example of rpmh sleep stats that supports to get AOSS sleep stats - - | - rpmh-sleep-stats@c3f0000 { - compatible = "qcom,rpmh-sleep-stats-v2"; - reg = <0 0xc3f0000 0 0x400>, <0 0xb261400 0 0x100>; - ss-name = "modem", "adsp", "adsp_island", - "cdsp", "slpi", "slpi_island", - "apss"; - mboxes = <&qmp_aop 0>; - }; # Example of legacy rpmh sleep stats - | rpmh-sleep-stats@c3f0000 { From f14600fc629e4d64ccdbb433d6a1f9bc79b4e992 Mon Sep 17 00:00:00 2001 From: Maulik Shah Date: Fri, 8 Jul 2022 13:58:23 +0530 Subject: [PATCH 3/3] Revert "dt-bindings: subsystem_sleep_stats: Add new compatible to get AOSD sleep stats" MSG_RAM is updated with AOSD sleep stats. Read from MSG_RAM instead from PDC registers. This reverts commit 0814882b9bc5d8bbe96fcd9155e32b31a201eaf5. Change-Id: If97daafaba890861a09dba59e09d622c5c76c70b --- bindings/soc/qcom/subsystem-sleep-stats.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/bindings/soc/qcom/subsystem-sleep-stats.yaml b/bindings/soc/qcom/subsystem-sleep-stats.yaml index 6257323e..e7971e6c 100644 --- a/bindings/soc/qcom/subsystem-sleep-stats.yaml +++ b/bindings/soc/qcom/subsystem-sleep-stats.yaml @@ -21,10 +21,10 @@ properties: compatible: Usage: required Value type: - Definition: Should be "qcom,subsystem-sleep-stats", "qcom,subsystem-sleep-stats-v2". + Definition: Should be "qcom,subsystem-sleep-stats". reg: - maxItems: 2 + maxItems: 1 ddr-freq-update: Usage: optional @@ -43,8 +43,3 @@ example: reg = <0xc3f0000 0 0x400>; ddr-freq-update; }; - - | - subsystem-sleep-stats { - compatible = "qcom,subsystem-sleep-stats-v2"; - reg = <0xc3f0000 0 0x400>, <0xb261400 0 0x100>; - };