Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2021802iog; Sun, 26 Jun 2022 04:51:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t94BA7icIT2zActRqu+Ue/AvLYaXonVYnVCth3EKzK1xAxElyEesJpmQhn/LYBSKZvv9aX X-Received: by 2002:a17:907:1c87:b0:6f0:29ea:cc01 with SMTP id nb7-20020a1709071c8700b006f029eacc01mr7948821ejc.671.1656244288102; Sun, 26 Jun 2022 04:51:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656244288; cv=none; d=google.com; s=arc-20160816; b=o09e9DkDs0DokZRyMl2vG94fR/A8Vi/ZF5QguxY0bX55YZoJf1s+lwUNLIw9cCvorc HqhnQguFYATSQ6YVRtcR5GkR1CWQ8ir/aATcmHf0s9/FSZHIx9Bh992PHAthNGtVDDJH nI+swgf7m+UcjEcbHpfnc6IrUiyeINeOz/gq9ZoWbTEje6JUhFj4x7vESh6ybjD0VwyS Nbgg0yN5/TD1HFpzzloY2qKfqemZilTCF3OD/e8qQR4UM95qzcfLhekN8sl87zE3GvE+ IpinouZI3Qgvt/EKtTsisMOtmBV7nVLT4KnK5jYUiiI0JGiOC14THYn8Otil2rPw9Z79 EKvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YndBNZ0lvr/m34EAnVpOYwY/mP5Uv37FbG+Xwh1ccJI=; b=qmDzCkEKg8p3Fv6Uv5Ha4YtmZHchcPa5vPjCD6He+vWTWOaokD6eli2sQgU5GNiUhs ONAwjheYgQYMXUUvwgZLg4l9yyugx/sNBszewxGWdzMFV0SBNO/yJ/u6iDXtiKTB11ta S+T+9TQ+MlreOXDEXfBBkMQ/tT7ddCVOG4GJ0CxDC7J0KLjPpkk7YdMueCY6d43O1l5W 5kYlW+8oucVcWAWrmqP/dvwKzSivBeR+oNWAfFCG4nmv3f1aV47F1eKGj9dyhkb8jo8W bXrIKNOPIf2CS+/k2wznrlLNUONNLweNMwldFFCDeO+UHNB2o/ji1bSjvyLH9czliWND KW2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ixit.cz header.s=dkim header.b=2FJrNomM; 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=REJECT dis=NONE) header.from=ixit.cz Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d17-20020a170906545100b00711fc1fb3cfsi8851625ejp.399.2022.06.26.04.50.50; Sun, 26 Jun 2022 04:51:28 -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=@ixit.cz header.s=dkim header.b=2FJrNomM; 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=REJECT dis=NONE) header.from=ixit.cz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234239AbiFZLs7 (ORCPT + 99 others); Sun, 26 Jun 2022 07:48:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229531AbiFZLs6 (ORCPT ); Sun, 26 Jun 2022 07:48:58 -0400 Received: from ixit.cz (ip-94-112-206-30.net.upcbroadband.cz [94.112.206.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2B2F11C10; Sun, 26 Jun 2022 04:48:57 -0700 (PDT) Received: from newone.lan (_gateway [10.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ixit.cz (Postfix) with ESMTPSA id C7DC62007F; Sun, 26 Jun 2022 13:48:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ixit.cz; s=dkim; t=1656244135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YndBNZ0lvr/m34EAnVpOYwY/mP5Uv37FbG+Xwh1ccJI=; b=2FJrNomMXgvJm37BBmW+DA6orjlOCG7vUIvaZjwtfC2SHOAJDzxiS5w/5UmHeZ9plMqe0W AKI1nS+CLfEj5OwR17tMNj7k4NWfdo78CwZqTi/chXklydDYSLyZPE6V1TzNBmtyB4IORH fSeS4A/p8DMhknQLjjlcevFHBUuNOsg= From: David Heidelberg To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski Cc: ~okias/devicetree@lists.sr.ht, David Heidelberg , Robert Marko , Guru Das Srinagesh , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] arm64: dts: qcom: extend scm compatible strings Date: Sun, 26 Jun 2022 13:46:34 +0200 Message-Id: <20220626114634.90850-2-david@ixit.cz> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220626114634.90850-1-david@ixit.cz> References: <20220626114634.90850-1-david@ixit.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_DYNAMIC,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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 Follow scheme where device specific compatible is first, then general compatible string. Cc: Robert Marko Cc: Guru Das Srinagesh Signed-off-by: David Heidelberg --- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi index 748575ed1490..19228e4f5313 100644 --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi @@ -125,7 +125,7 @@ opp-1800000000 { firmware { scm { - compatible = "qcom,scm"; + compatible = "qcom,scm-ipq6018", "qcom,scm"; }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi index ffc3ec2cd3bc..6fd361be0fe2 100644 --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi @@ -215,7 +215,7 @@ L2_1: l2-cache_1 { firmware { scm: scm { - compatible = "qcom,scm-msm8953"; + compatible = "qcom,scm-msm8953", "qcom,scm"; clocks = <&gcc GCC_CRYPTO_CLK>, <&gcc GCC_CRYPTO_AXI_CLK>, <&gcc GCC_CRYPTO_AHB_CLK>; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index ab95ec4a7491..7c854c9c2517 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -357,7 +357,7 @@ opp-2150400000 { firmware { scm { - compatible = "qcom,scm-msm8996"; + compatible = "qcom,scm-msm8996", "qcom,scm"; qcom,dload-mode = <&tcsr 0x13000>; }; }; diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index d0760e6ec942..fc4a490add48 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -628,7 +628,7 @@ cpu7_opp20: opp-2841600000 { firmware { scm: scm { - compatible = "qcom,scm"; + compatible = "qcom,scm-sm8250", "qcom,scm"; #reset-cells = <1>; }; }; -- 2.35.1