From patchwork Mon Mar 13 11:41:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 663938 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C3C2C76195 for ; Mon, 13 Mar 2023 11:42:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231154AbjCMLmQ (ORCPT ); Mon, 13 Mar 2023 07:42:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230496AbjCMLl4 (ORCPT ); Mon, 13 Mar 2023 07:41:56 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E8A665C48 for ; Mon, 13 Mar 2023 04:41:22 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id n2so15257507lfb.12 for ; Mon, 13 Mar 2023 04:41:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678707678; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=VaeNat/r39kxcqF7BN2wWc7swe6HV6M8E5ETNmOYRZQ=; b=YUk/I/O3kiX/JKsTnxRfOsR8Zky9UKva3xOg+ByHwUbKeu7YcHMS0i5RNenXBJPUaZ +Qt1P+AWVxaxP9j02K5Y5Sk+jAzdEfFImcdOj4K9iN4iCAGtbYdVKobtGSklmVUOSXW2 E8XEnsLYHNi3TT5PPReJk0UB4DWqMz0tle2w/SgaqAsEqeil6NQ1/fyMYCgUGvHKZ9qU 5gCxt66CCtO5fF28YTY/MQ2B5uOxfQkw3isRoFU1HJYbdzIZESJHi5yfyMvv3TOXqILU 49F786nnFj/W4xkceWhjdmyzksLFUZXUsKqfOeeeQFZdYmdtBcb3fgGg9jxVSeZt25g+ phEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678707678; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VaeNat/r39kxcqF7BN2wWc7swe6HV6M8E5ETNmOYRZQ=; b=rciKYMEmAiSr5iG6hsySKh4XgWHLF+t4LVpaXtpFFequHnzuJlLoOoMVX68Mg1zANa TqB/o5Ov1kV9fkTXJDfYBq75EGcdRcLQ9pK006BmDKZoqv8VKG+ciF3BopNUuw4XBptu Uigp61jqlwIvo2iwLkMRleuo2WJdHl84LzYF8HN3uTGi25vs2GF7hzhSvlUHyrMQxZO3 8TGjOrjfbjzhEN22Rimt++iZTgjyLVjCupVuCmDMzhE4oBvJRKDqXLW9otDUFEDlD2T3 YMjXC7A3292aw9eT7Rso8/3P2Ka7kfgQuFBnosODjoAvqxMOZvGJAcTcH8XhZXeDTwX/ Ch4Q== X-Gm-Message-State: AO0yUKV15ZXmG06B5LnN2q7VLjjxO95ns2Rhw20pCscYHToV3srryzjY 5IymN02hjuCOD0wxU6EEX2qZiA== X-Google-Smtp-Source: AK7set90kRV+4rOoqD9GMvOoW28cV+Q+7sP+gOoKNg27pxmJlh8TNHtJb9YwJpeePPn8282Kyz1brg== X-Received: by 2002:ac2:5391:0:b0:4dd:abb9:dae4 with SMTP id g17-20020ac25391000000b004ddabb9dae4mr10139714lfh.25.1678707678010; Mon, 13 Mar 2023 04:41:18 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id i2-20020ac25222000000b004d86808fd33sm948465lfl.15.2023.03.13.04.41.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 04:41:17 -0700 (PDT) From: Konrad Dybcio Date: Mon, 13 Mar 2023 12:41:07 +0100 Subject: [PATCH v2 1/7] dt-bindings: interconnect: qcom,msm8998-bwmon: Resolve MSM8998 support MIME-Version: 1.0 Message-Id: <20230304-topic-ddr_bwmon-v2-1-04db989db059@linaro.org> References: <20230304-topic-ddr_bwmon-v2-0-04db989db059@linaro.org> In-Reply-To: <20230304-topic-ddr_bwmon-v2-0-04db989db059@linaro.org> To: Andy Gross , Bjorn Andersson , Krzysztof Kozlowski , Georgi Djakov , Rob Herring , Thara Gopinath , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678707675; l=3131; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=SbN98Ibah4gas5eacqICwCuMX8VfaPWlZmkr7n14GAg=; b=DdyWr1FxIsUnPNy/1QEqjJJtlRLNjh6PqilSYN3ygAQcO44LPckma+4V/1hDmmIjwyBAFbysYGX1 Dz6T7uwpDLzhX+9LiT3WKSbb7aQXxdaPXvTOC12NEsCFPDAhU6D1 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org BWMONv4 has two sets of registers: one for handling the monitor itself and one called "global" which hosts some sort of a headswitch and an interrupt control register. We did not handle that one before, as on SoCs starting with SDM845 they have been merged into a single contiguous range. To make the qcom,msm8998-bwmon less confusing and in preparation for actual MSM8998 support, describe the global register space and introduce new "qcom,sdm845-cpu-bwmon" compatible while keeping the "qcom,sdm845-bwmon" as a fallback for SoCs with this merged register space scheme. Signed-off-by: Konrad Dybcio --- .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 41 ++++++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml index 12a0d3ecbabb..5d17bdcfdf70 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml @@ -22,14 +22,14 @@ description: | properties: compatible: oneOf: + - const: qcom,msm8998-bwmon # BWMON v4 - items: - enum: - qcom,sc7280-cpu-bwmon - qcom,sc8280xp-cpu-bwmon - - qcom,sdm845-bwmon + - qcom,sdm845-cpu-bwmon - qcom,sm8550-cpu-bwmon - - const: qcom,msm8998-bwmon - - const: qcom,msm8998-bwmon # BWMON v4 + - const: qcom,sdm845-bwmon # BWMON v4, unified register space - items: - enum: - qcom,sc8280xp-llcc-bwmon @@ -49,9 +49,13 @@ properties: type: object reg: - # BWMON v4 (currently described) and BWMON v5 use one register address - # space. BWMON v2 uses two register spaces - not yet described. - maxItems: 1 + # BWMON v5 uses one register address space, v1-v4 use one or two. + minItems: 1 + maxItems: 2 + + reg-names: + minItems: 1 + maxItems: 2 required: - compatible @@ -63,13 +67,36 @@ required: additionalProperties: false +allOf: + - if: + properties: + compatible: + const: qcom,msm8998-bwmon + then: + properties: + reg: + minItems: 2 + + reg-names: + items: + - const: monitor + - const: global + + else: + properties: + reg: + maxItems: 1 + + reg-names: + maxItems: 1 + examples: - | #include #include pmu@1436400 { - compatible = "qcom,sdm845-bwmon", "qcom,msm8998-bwmon"; + compatible = "qcom,sdm845-cpu-bwmon", "qcom,sdm845-bwmon"; reg = <0x01436400 0x600>; interrupts = ; interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_LLCC 3>; From patchwork Mon Mar 13 11:41:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 663937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E32BC61DA4 for ; Mon, 13 Mar 2023 11:42:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230502AbjCMLm1 (ORCPT ); Mon, 13 Mar 2023 07:42:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231156AbjCMLl7 (ORCPT ); Mon, 13 Mar 2023 07:41:59 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 126B564A85 for ; Mon, 13 Mar 2023 04:41:26 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id s20so15286012lfb.11 for ; Mon, 13 Mar 2023 04:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678707681; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=yMd/fSoMYLuM7nLGHQDb8PX/xkwXM/q1Im1epEv8KM8=; b=hOJ2OIfcQ8xmOUjCn3bxJpYAGXWj68VTQ5iYJZ4OSb94VIBEomBBAl9kDiPCg2pJ4r PLDG5GH5uQhx0HoIFFnSUULNMCeF6B1OFxY4OGsMEezU09bkRqzVX/40rlxTFnMb0yNL AoWzp4zxNMuf5d6DyZUUmsNllrorc0AmUyYaQ7VO/ivT5GSssvB7kAF8+wmdT1YkdFWs UduOL+1ltbv0U/oNLQDA72LXVL+En/Annqc6mghhfur6pQyv7cVHGy+8TDA2h0oT5ZOr S36b9fmVd48KL2AvY6tnKkuxd2dvE5tZAVVaWkinXmjQ+tbztxHNLe15kTnCaQS3g5iW D9hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678707681; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yMd/fSoMYLuM7nLGHQDb8PX/xkwXM/q1Im1epEv8KM8=; b=LRDW8iHXMJEdeW9H+zM0pWfVeQdpJy0hlhHET62FrUzhUeYuVQz6nLFBphjQ2zhRqq HUCo570TyCy4xdN5D1G59oVtzMzSvjlUUKp99AoGO52QdUqAwpVUSa9wVaA0B9cWiPaF LXkX9m4N6GD9k8rsS1KzIU/vhDwLu9DLt7X0/FcuxBPuxwVOlrJg/GgtyKzj91OU6Jdb Af2Nc6IO0eBvspgJ2cRkbcCzFRS7IgJFRjaL6SUj9jQrlnyCBzfm3Mb8abNAmMK9f+QH zhp6fHF/Yr/1FMTd3U+PnHzBeUbvMNeEEA6oegUpavDSyMkWGicKYF7s5nKTcZW/aEN6 5Ajw== X-Gm-Message-State: AO0yUKXHpuZkwAJVZX57vWQTtdZAZs43fxCuCESCsNh17enhsRhJjBzN 3hBd2DSsP5RvDeoflyTOL6Vpag== X-Google-Smtp-Source: AK7set9zmrkT7t9m8xfL27x8Lgvt0fcFSb+J0GYy9/1OhupDm3dJ64Pl4oe7T5QQ9b8ckQwMYHzSGQ== X-Received: by 2002:ac2:5106:0:b0:4db:3a92:2c85 with SMTP id q6-20020ac25106000000b004db3a922c85mr9821478lfb.67.1678707681234; Mon, 13 Mar 2023 04:41:21 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id i2-20020ac25222000000b004d86808fd33sm948465lfl.15.2023.03.13.04.41.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 04:41:20 -0700 (PDT) From: Konrad Dybcio Date: Mon, 13 Mar 2023 12:41:09 +0100 Subject: [PATCH v2 3/7] soc: qcom: icc-bwmon: Remove unused struct member MIME-Version: 1.0 Message-Id: <20230304-topic-ddr_bwmon-v2-3-04db989db059@linaro.org> References: <20230304-topic-ddr_bwmon-v2-0-04db989db059@linaro.org> In-Reply-To: <20230304-topic-ddr_bwmon-v2-0-04db989db059@linaro.org> To: Andy Gross , Bjorn Andersson , Krzysztof Kozlowski , Georgi Djakov , Rob Herring , Thara Gopinath , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678707675; l=851; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=a+7UxhwPe8d61BMoAwcf5BTpQhH1To5AXAuiYkU2/Ik=; b=jUx0oZRfG7dGC/yyC6ZvD4X+x5wFkeq9oqlm+aYDu6ZAmyyHWKxjetMpSaN0o4ZZeWXm+sEeHUqy epkaJ87nDnBsnP6G6l6VMN7r+lHUQJOYofaPmZBasDh8Iw2jifMv X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org bwmon->regmap was never used, as the regmap for bwmon is registered through devres and accessed through bwmon's regmap_field members. Remove it Fixes: ec63dcd3c863 ("soc: qcom: icc-bwmon: use regmap and prepare for BWMON v5") Reviewed-by: Krzysztof Kozlowski Signed-off-by: Konrad Dybcio --- drivers/soc/qcom/icc-bwmon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/soc/qcom/icc-bwmon.c b/drivers/soc/qcom/icc-bwmon.c index 2fe67a3cd2d7..3a3230a62ad9 100644 --- a/drivers/soc/qcom/icc-bwmon.c +++ b/drivers/soc/qcom/icc-bwmon.c @@ -184,7 +184,6 @@ struct icc_bwmon { const struct icc_bwmon_data *data; int irq; - struct regmap *regmap; struct regmap_field *regs[F_NUM_FIELDS]; struct regmap_field *global_regs[F_NUM_FIELDS]; From patchwork Mon Mar 13 11:41:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 663936 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9DEAC76195 for ; Mon, 13 Mar 2023 11:42:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231314AbjCMLmg (ORCPT ); Mon, 13 Mar 2023 07:42:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230461AbjCMLmA (ORCPT ); Mon, 13 Mar 2023 07:42:00 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C217164A8C for ; Mon, 13 Mar 2023 04:41:28 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id i28so15345065lfv.0 for ; Mon, 13 Mar 2023 04:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678707683; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=SCGFjRBw5kwMjl8qNpiz2QImrKHMHXlVZTsDYHugyGg=; b=Hevw8MpUQhJ7dhCXv28ZA3swpM0Ffb+hqVdNWZm7xQ9v9eTnnUy/32o6XO7j7DMCvz WaC+vdC29jTZ5FRWSXUfLjfEDGxSFHpy+Jls70apaMuK9LBi51+H22vwnLWYJBiSRF6z qkcu+WSSCkkrR7p8G7ydui/hvMlUDLfBnBm2Cl3a0mjpTwh05Y1q3YFpbWd6RVHZE7/K mnbPJ050unHHZyqS/jAE9vXjqSuKtRi0Kxh4bDqu6d/iGwuwa2jKnDhGZW0/GTWXp300 YGvAdVwL8m7wzF6s0fT4EVx0oQa9XFbZHbwlHtkhrUUeRUENQmrp2FwEiOYpyOV+tOT8 FGgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678707683; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SCGFjRBw5kwMjl8qNpiz2QImrKHMHXlVZTsDYHugyGg=; b=nN8sPVU+21Nwxc5ORt00c5HtwXBLpZzEFfHhzpHPKqaTi0RWSVbnl8tZ1J5bjNfBzk cr3bt/KQoM2Ir1N9v5xVXdifmI8mthlxNHN/kIKOI/lU0XDgw4Uk7mUQQiY0GAxhVbrB /glgtvFoeCB+3ECi15lh1xrCm3Wtg+9hq5JHPWSshX1gPwa+hJxfhAv6mseX8tvbd7Lh 4ixFskz/4w/gYdCwMh8TnlTqgCHPTIm7EjfkJK4BeiApLcP4hLyJRvpBxk4JCUdzXk+U wrBseb49sjON7u5OUT4iHVMLj6mVhNUyK/J2PXYAppP8dtHVkGZUbIuIj3PcR8rE3Mco 2xIw== X-Gm-Message-State: AO0yUKUm/TDRJ5LQgLENpv4oJALC3P33JhjTQTQi4yn20MzC5viXkjkP aG+PE+F4vQPMgjKyQPcU07xOyw== X-Google-Smtp-Source: AK7set9p2ibp3gnxwnhhNIVY7ndNWc9bkAeYbLeGTpt+vkBn28KfcVYod45QeMaEjyMrscM/aBFR0w== X-Received: by 2002:ac2:59dc:0:b0:4d8:537a:753f with SMTP id x28-20020ac259dc000000b004d8537a753fmr10970228lfn.6.1678707683533; Mon, 13 Mar 2023 04:41:23 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id i2-20020ac25222000000b004d86808fd33sm948465lfl.15.2023.03.13.04.41.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 04:41:23 -0700 (PDT) From: Konrad Dybcio Date: Mon, 13 Mar 2023 12:41:11 +0100 Subject: [PATCH v2 5/7] arm64: dts: qcom: sc8280xp: Use the correct BWMON fallback compatible MIME-Version: 1.0 Message-Id: <20230304-topic-ddr_bwmon-v2-5-04db989db059@linaro.org> References: <20230304-topic-ddr_bwmon-v2-0-04db989db059@linaro.org> In-Reply-To: <20230304-topic-ddr_bwmon-v2-0-04db989db059@linaro.org> To: Andy Gross , Bjorn Andersson , Krzysztof Kozlowski , Georgi Djakov , Rob Herring , Thara Gopinath , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678707675; l=790; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=IfB7PpYzYG3JhtNIYAVnyF67Vej4u/Zl5gN61g/4fsQ=; b=qDWyQPMu7J26e1w/bsNK1rpsK3lhrpiLLXq5/I9EI6+1HEGUbVv6euLgP/9by1+5H7qdVhwNlZW7 kgqOguKGCB5vj9r7FeUCCJ3WpOlTFXdrbgKWpw0C/QeO+LpbQe/7 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Use the correct fallback compatible for the BWMONv4 with merged global and monitor register spaces. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index 0d02599d8867..131b99bfe771 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -2946,7 +2946,7 @@ opp-12 { }; pmu@90b6400 { - compatible = "qcom,sc8280xp-cpu-bwmon", "qcom,msm8998-bwmon"; + compatible = "qcom,sc8280xp-cpu-bwmon", "qcom,sdm845-bwmon"; reg = <0 0x090b6400 0 0x600>; interrupts = ; From patchwork Mon Mar 13 11:41:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 663935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A274C76195 for ; Mon, 13 Mar 2023 11:42:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230512AbjCMLmo (ORCPT ); Mon, 13 Mar 2023 07:42:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231173AbjCMLmB (ORCPT ); Mon, 13 Mar 2023 07:42:01 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B2FB64AB5 for ; Mon, 13 Mar 2023 04:41:32 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id g17so15320279lfv.4 for ; Mon, 13 Mar 2023 04:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678707685; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=nhcwZlNg1FLmmoVA2v+6lR/X6B7kwoWSENbvRw3V+fM=; b=vfSPDSVrRfmUnyJTEAUk27gZ10xbrdknu8UTKubV/WT0zi5EufFWzhMxppY2TQx5X8 kGMGqLrG9x2pHGecSJUUh3uwY/+Uo+DaEksZzSaQBMiHK7Rpr/ftnDfnFXIW1GzA3+g/ vksxTrEaxTrgPG1Skc85M7cWweigIeS1wLicUl0lwYawScQmoNRafs1XuN8lo7uYVsp+ wlZNfXvB1f38GcNEewUE2YX820CZvZjHWeyg43RORrGTP/DCsT26NdXFvKj2A6Oa8boN uVn8986tIGtQZzI96vHQRmsSY1lp0WTFH8gjEjcLrhl6YO+s+Bj8p9KCXY5W+T6l0+gn uLPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678707685; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nhcwZlNg1FLmmoVA2v+6lR/X6B7kwoWSENbvRw3V+fM=; b=NcYJ4cDJVKcLz0r7HjjKoBHfqm/tLGK0qBwfT2evCPPzdF81PxkRNPbtL8UBF5bSlf GfNS0YKeY/jNVQyZj3XjFs59f/N3JbBYuvvck/6S5VTXltkhay8QKVTBwplSgqSBa7XD 9SdWEvBrcr1ageIjQH9oBsKZ/edbPzL8QxBR2TgjE6IoOy2g7iQTl4mI+iK2XoDWKO9Y HByuLwAmGvLaA9R6xVBFDVA+XqcqQw6TqmClRqiIbtihcz5vspARkViRLJaSOIxy8oNC lHyDxAJluo+De0V/t833zU+JnIta/325i+UiRsBvTY/Eln72GqNmVjxk02gS6QEvrA/K PXxQ== X-Gm-Message-State: AO0yUKUQA7sbpE1x1XGO/X2Z1FYuC5E2AqO+gOoz14/E8wxTM5UJ3kjl OlAOH/8E5FsSZYaJTqSsTkQ39w== X-Google-Smtp-Source: AK7set9nUZb/LOKJ1Ru3fd+Ng3zRMdv8buZPjLGcDSqZD+Jdo7l6mTnGUQ+SRa1ouS0Yaom0DfBFTQ== X-Received: by 2002:a19:ac05:0:b0:4b5:5b36:28bd with SMTP id g5-20020a19ac05000000b004b55b3628bdmr3310115lfc.2.1678707684861; Mon, 13 Mar 2023 04:41:24 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id i2-20020ac25222000000b004d86808fd33sm948465lfl.15.2023.03.13.04.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 04:41:24 -0700 (PDT) From: Konrad Dybcio Date: Mon, 13 Mar 2023 12:41:12 +0100 Subject: [PATCH v2 6/7] arm64: dts: qcom: sdm845: Use the correct BWMON compatible MIME-Version: 1.0 Message-Id: <20230304-topic-ddr_bwmon-v2-6-04db989db059@linaro.org> References: <20230304-topic-ddr_bwmon-v2-0-04db989db059@linaro.org> In-Reply-To: <20230304-topic-ddr_bwmon-v2-0-04db989db059@linaro.org> To: Andy Gross , Bjorn Andersson , Krzysztof Kozlowski , Georgi Djakov , Rob Herring , Thara Gopinath , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678707675; l=887; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=N++71rZKj+7oTWz7RtdV/kr/uVQ7WD5qOJ8G1FDU0t4=; b=B0vj+qTKkpt9ihZA5zXoBsvvJQfdra8ZsocCae4Got+Y6tx4AhzbMPk2vXYSkRuhPD7vxTLnJftX bzkqiBb0C2hHUke1lwm26GpmHmbmSzaJ0AuEAYgUP2yJdNQz53K+ X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Drop the incorrect msm8998 fallback and use the new qcom,sdm845-cpu-bwmon compatible to distinguish the DDR BWMON found on this platform. Signed-off-by: Konrad Dybcio Reviewed-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 479859bd8ab3..1f2a97a20ef3 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -2241,7 +2241,7 @@ opp-4 { }; pmu@1436400 { - compatible = "qcom,sdm845-bwmon", "qcom,msm8998-bwmon"; + compatible = "qcom,sdm845-cpu-bwmon", "qcom,sdm845-bwmon"; reg = <0 0x01436400 0 0x600>; interrupts = ; interconnects = <&gladiator_noc MASTER_APPSS_PROC 3 &mem_noc SLAVE_LLCC 3>;