From patchwork Wed Aug 9 19:20:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 133565 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp35541vqi; Wed, 9 Aug 2023 15:06:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUeUzzw4uF/GTU0NYhvzZV3DHfiTC1kFcnUYA0c02xSu5oy7W3StNynsgdBjOUjzyQozYH X-Received: by 2002:a17:902:b70e:b0:1b8:1c1b:125a with SMTP id d14-20020a170902b70e00b001b81c1b125amr402188pls.2.1691618818814; Wed, 09 Aug 2023 15:06:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691618818; cv=none; d=google.com; s=arc-20160816; b=isUGEFTz77yQUPR4A228+O7R02Q4CIy9a7EYJSZs1M1eCpS2lEtF0AKl9MRiPE5mFY TIjZEX5LYhNqQZ/e9xAbuKNfhUHm/2tMPAA87lwUDgMjiR5wSVc0hUAFj3ZU+DPR0CxU 1s5N/N0T2tg4uLmcWjExsZkmRoshTTPjN98/Hix4fH2LgTbNEjiNoBfvWg/VxOYksV97 dmx6/xIQq9N10MsZmkhwfxuFjpwHsZ8PYNVZLm0SXRhX/K9h+QIdLbkBqHdqnC7Rh61y LU1gaNlmJlAaEO/XeZZ+VjWQXGQyPA5xG01YmRcYDjHnVByzioWeXMtwr2T9nJP1s96B 4qzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=PKzXZ2xoOmtz+1E6ZSxEFtLtyfPfJbw38y+S2GZug7o=; fh=tQ6WQpNN1otqzXehPf6W3PFXfcQlgqRAJCCJbW143lA=; b=S4d5+SB5CwocGAY1aFuhJFCnVtcjk0e/0YyNVBacgNHUyVGPDWjlJyxuRx4mdXAD9p 6xe7Zp85TAo3FXtXNEASfU0PcVEtEFHw1DvqOrLBzOiOnWUs0EVO9OZwtn/o0kn7KfZa k6mWH97leZs58r1QnbtoHh/++dsTfnEi5XXYHcgYjFqk47/ae2wBQCr4DMNxmy6y3ite eXHXtKJp3UItlnS9AISsLhr2PkWK/F5xK1fS74qNZ0SWb/jBLNN+2ZcXdMV80Xu8uT4D nWNtrxdSMVBo3GtqEn13qlBBPNU0qR47ZHC/9mpfKy5ceaJXrwVixZJbdTgz8y4kPHyf EUmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ktOkxMQc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b8-20020a170902e94800b001bc52116351si78392pll.70.2023.08.09.15.06.43; Wed, 09 Aug 2023 15:06:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ktOkxMQc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233803AbjHITVk (ORCPT + 99 others); Wed, 9 Aug 2023 15:21:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233718AbjHITVa (ORCPT ); Wed, 9 Aug 2023 15:21:30 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D04463C2F for ; Wed, 9 Aug 2023 12:21:09 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2b9ba3d6157so2395151fa.3 for ; Wed, 09 Aug 2023 12:21:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691608849; x=1692213649; 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=PKzXZ2xoOmtz+1E6ZSxEFtLtyfPfJbw38y+S2GZug7o=; b=ktOkxMQcgVGObAcCt3Knbm410wsa9H2uDdEZ/bh/kb/PTY1yoBH/UsES4eG/yOaN+q 3gzHgW9KgTARcZ05z2S8O6wE54tVnWFb2jvcTNOfCtBvkYbtIoOj1QkrguFI107bp+do XIxkH/f0RznHU8aaw59Qe4YS9C//aPlDruZn9wdBFkfbCjC09zY1y/vJyzxXw81sb67K AUd/rg7n58SkzCAUGrTNF8UDDGDtpx+DBjknpO/qGPt0fnfXauXI3wEATyfgOpbhPNNV Q9ZEZZdWFxXtIQCpYlCm57pEKF6boSnrhk0jAZQkOJXZ93ssJ/vJ8MX3oTGbPoWHECHb agsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691608849; x=1692213649; 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=PKzXZ2xoOmtz+1E6ZSxEFtLtyfPfJbw38y+S2GZug7o=; b=bAcc8FqyZEITzJJitSjKHircR/K2hugVAY82jRZf6FJUqdW6LJ4KONcwxIgtQYvDB/ pjbqtxiVjPoaJcWB7RkoHX3m6nHvU3c2Iwo+XNyxQ1i7qPXtSx4cahYwR3O3rZ8mqwqx hjJnwbc2gnKFlhBMlCYJ9zTgBdf5Y21WjwqrawBo4ky3scIWaYPYhXXK+Dn+SgZR2DKp vhIK6Gzu+fi6wKFHZuJXnOWHfg/fvoOU4UD/cEAkRl+NZQIJaAfS2UOFHXb20R3PRAAX tT+PGxcDQ6OWYk91AulSX7hfcDbd5mcrYEEfq7ma9oZsMFpdmWvngtNprovQzAAqVaYx 1kWw== X-Gm-Message-State: AOJu0YxsArdQHPj1ZjIp8EqEfQi3gRaco1RvOIikkXEqpj13x6q0v7Ag qVv+V4RDydMpy8DPY/fzad0R1iYRXzT+vEUPfVE= X-Received: by 2002:a2e:9a8c:0:b0:2b6:9da9:2884 with SMTP id p12-20020a2e9a8c000000b002b69da92884mr82130lji.40.1691608849543; Wed, 09 Aug 2023 12:20:49 -0700 (PDT) Received: from [192.168.1.101] (abxi185.neoplus.adsl.tpnet.pl. [83.9.2.185]) by smtp.gmail.com with ESMTPSA id o3-20020a2e9b43000000b002b9ed203af1sm2863218ljj.132.2023.08.09.12.20.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 12:20:48 -0700 (PDT) From: Konrad Dybcio Date: Wed, 09 Aug 2023 21:20:29 +0200 Subject: [PATCH v3 6/6] dt-bindings: arm-smmu: Fix MSM8998 clocks description MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v3-6-ba1b1fd9ee75@linaro.org> References: <20230531-topic-8998_mmssclk-v3-0-ba1b1fd9ee75@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v3-0-ba1b1fd9ee75@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , AngeloGioacchino Del Regno , Michael Turquette , Stephen Boyd , Jeffrey Hugo , Imran Khan , Rajendra Nayak , Joonwoo Park , Jeffrey Hugo , Will Deacon , Robin Murphy , Joerg Roedel , Jeffrey Hugo Cc: Marijn Suijten , Dmitry Baryshkov , Jami Kettunen , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, Konrad Dybcio , Krzysztof Kozlowski X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1691608824; l=2584; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=AwK2agC2XLAE1uApMOG3gNnll+6I3sbngtzNXhteFLY=; b=9iedVVmx0RYZnXA8MtHQb4WwXu0MUQvJzEqf1sqEeHux/YcxVW+ah4TFsuR9KgpG7fZyLt/gQ 3Eq/kgMEGY1ATnANKZsWUEs/orzBde4cvjS2RzEFnclWUMH/ZMEAhj7 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773790894768376034 X-GMAIL-MSGID: 1773790894768376034 MSM8998 was abusingly referencing one of the internal bus clocks, that were recently dropped from Linux (because the original implementation did not make much sense), circumventing the interconnect framework. Fix it by dropping the bus-mm clock (which requires separating 8998 from similar entries) and keeping the rest as-is. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Konrad Dybcio --- .../devicetree/bindings/iommu/arm,smmu.yaml | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml index 3a31a979709b..cf29ab10501c 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml @@ -270,6 +270,47 @@ allOf: contains: enum: - qcom,msm8998-smmu-v2 + then: + anyOf: + - properties: + clock-names: + items: + - const: bus + clocks: + items: + - description: bus clock required for downstream bus access and for + the smmu ptw + - properties: + clock-names: + items: + - const: iface + - const: mem + - const: mem_iface + clocks: + items: + - description: interface clock required to access smmu's registers + through the TCU's programming interface. + - description: bus clock required for memory access + - description: bus clock required for GPU memory access + - properties: + clock-names: + items: + - const: iface-mm + - const: iface-smmu + - const: bus-smmu + clocks: + items: + - description: interface clock required to access mnoc's registers + through the TCU's programming interface. + - description: interface clock required to access smmu's registers + through the TCU's programming interface. + - description: bus clock required for the smmu ptw + + - if: + properties: + compatible: + contains: + enum: - qcom,sdm630-smmu-v2 - qcom,sm6375-smmu-v2 then: