| Message ID | 20221224214351.18215-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp306920wrt;
Sat, 24 Dec 2022 14:05:38 -0800 (PST)
X-Google-Smtp-Source:
AMrXdXtJ9sEnvK/ba8Scd8/rS/h6rg59Knl71hkVa8Rilrh3yrAqOEEGHxWJHIwHhb+6CvgjqKFZ
X-Received: by 2002:a17:906:9616:b0:78d:f457:108f with SMTP id
s22-20020a170906961600b0078df457108fmr11153503ejx.76.1671919538390;
Sat, 24 Dec 2022 14:05:38 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1671919538; cv=none;
d=google.com; s=arc-20160816;
b=eZeK+cdWmhTOhWvEnU1m3ZqvemheNIv7g+vDohDesJ6fDJm8vnhiuGwFbbb7E0POOR
Cj874/g4HVHLiTOdJmawgbT25VwG6mzcRfDCsYkPod9DilSVujCF+JwVMbPDhlnHMzns
pVS75OM2ek721NKkzdys+u5AeGALSrahFER9zhnTfbLWPYISFTdO4jNFWl0imH9XjLRW
n1tIxjOaSDzXsWrz/9r8XkTy0ube3BYvRXqm6G5KJlI/o/NPnA1nDLLh6sstMMzkvqVI
05nRKh/pgoHrbttWahjP9Y0L84otM1h4G+NqXWdcGd5PjUqLf8llVGqjEAGPkLVa6EKr
H85w==
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
:message-id:date:subject:cc:to:from:dkim-signature;
bh=Tzz+BP69NAct4xSytGrEtJG8lGhPYUMzf/5vG9X4+Ps=;
b=f2bu+gnQxfRQkpk70HkQPW89CipRbZk1PZeBOSSEWUG6cbMa1OeBZp4+5LqNNSaCvH
GnqM4ikc8b1cb1Remv7At5UBVR12zJBjDZ8VdHsk0vxR0zbFCugUtDI/q4p0bww0M2a9
c/oAG2a3k5G/nmCngTD8lEYrJ3/9Ch9VES4Yq0LsesJpaXLmXW59WR5dLSO9X5LvGv8W
Z1niSWmVvrDrU1TZZX3Cid4EJ7Z6mSlwgHBINucx7/x7dYaKjvP0p4TAvAfIqQl3R3z5
fbaPnQu6vyGTaqAf+CiMWlZ2K3b2LWDBP1dWpFu+qX+hlZuge8uWWAlFuDBytXLkNaxC
vUxA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=w8U8ZHfS;
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
oz32-20020a1709077da000b0084514612c23si5773045ejc.648.2022.12.24.14.05.14;
Sat, 24 Dec 2022 14:05:38 -0800 (PST)
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=w8U8ZHfS;
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 S230386AbiLXVoC (ORCPT <rfc822;eddaouddi.ayoub@gmail.com>
+ 99 others); Sat, 24 Dec 2022 16:44:02 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56890 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230060AbiLXVoA (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sat, 24 Dec 2022 16:44:00 -0500
Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com
[IPv6:2a00:1450:4864:20::131])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55C3BBC16
for <linux-kernel@vger.kernel.org>;
Sat, 24 Dec 2022 13:43:58 -0800 (PST)
Received: by mail-lf1-x131.google.com with SMTP id bq39so3651885lfb.0
for <linux-kernel@vger.kernel.org>;
Sat, 24 Dec 2022 13:43:58 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=Tzz+BP69NAct4xSytGrEtJG8lGhPYUMzf/5vG9X4+Ps=;
b=w8U8ZHfSAS0HK7Nj9h2jGYe8lct0qZlXSdiyx7S4Q707B0DTMdFZDG8uifTX3jp/Qu
5/DvyefC9yxvCCiK3rb0SQQjKxDoIZlM/JgqCPd6wp1+OhtjgS6cLZEBQn2yxJrDgc1F
r8s3Vt0ohIZ9jz1zFL015Z3+ddZRx1LN11+HVUN/gaBZZv01oO3bO/7tToBSFvdb0v9p
OGXTKIwRdg4e4gjirE0jyH0OVpJa/lB3bk2S/vA/FHrAto0XllJZmkRioNFD4N0ZndRO
fKnRznYqDrCT4BgLPih1VVi9iBqjztfGXbyHPlf0j2iro6TETC2a1FqG+WDnrsgkFmXI
jUjw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=Tzz+BP69NAct4xSytGrEtJG8lGhPYUMzf/5vG9X4+Ps=;
b=UU1fGSDe3acdFehl/td74F9J811iKHMyTs6kxFtoaWjbn7y0xvMzI7adPn/Nm3+cxu
c+scf/DYY2Go48RnuoXXoacHFWmgrSKMAiSEvL1oU2qsk6jb/FYIbSHUR5fvWY89HIpL
QaAKEJYT+lwKW5FJ8UTZvjVzFzBnsE/w4KP2JA5Ct3vZR5h9gYVvTuZviPVM0VHYBis6
hn+pd0++28CdeAehxBIyz1x5qeF3nCtWq0/U7UGnY6ee9f8sfR+zebdgpFjcLCPs1CtH
ebMo0xXQIUHiRVI522qKCTyND6bmcU6xdgdXjdKuYAtvvJFKjRyhYb2dL1DomN79RRSo
PdmQ==
X-Gm-Message-State: AFqh2koJtXgLajw8s2cibof9zpiodQrAvL4ZhjFue3FiQkRN+jlH7xnV
Yg7YIKYOxo3IKN0MwNXPBzSinA==
X-Received: by 2002:a19:7414:0:b0:4b4:bea4:15c9 with SMTP id
v20-20020a197414000000b004b4bea415c9mr4302729lfe.21.1671918236644;
Sat, 24 Dec 2022 13:43:56 -0800 (PST)
Received: from krzk-bin.NAT.warszawa.vectranet.pl
(088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67])
by smtp.gmail.com with ESMTPSA id
j13-20020ac2454d000000b004c7d0ed9619sm1117861lfm.123.2022.12.24.13.43.55
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 24 Dec 2022 13:43:56 -0800 (PST)
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Subject: [PATCH] arm64: dts: qcom: sm8350: correct SDHCI interconnect
arguments
Date: Sat, 24 Dec 2022 22:43:51 +0100
Message-Id: <20221224214351.18215-1-krzysztof.kozlowski@linaro.org>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1753134701941376707?=
X-GMAIL-MSGID: =?utf-8?q?1753134701941376707?=
|
| Series |
arm64: dts: qcom: sm8350: correct SDHCI interconnect arguments
|
|
Commit Message
Krzysztof Kozlowski
Dec. 24, 2022, 9:43 p.m. UTC
The interconnect providers accept only one argument (cells == 1), so fix
a copy&paste from SM8450:
sm8350-hdk.dtb: mmc@8804000: interconnects: [[74, 9, 0], [75, 1, 0], [76, 2, 0], [77, 36, 0]] is too long
Fixes: 60477435e4de ("arm64: dts: qcom: sm8350: Add SDHCI2")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Fix for v6.2-rc merge window.
---
arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
On 24.12.2022 22:43, Krzysztof Kozlowski wrote: > The interconnect providers accept only one argument (cells == 1), so fix > a copy&paste from SM8450: > > sm8350-hdk.dtb: mmc@8804000: interconnects: [[74, 9, 0], [75, 1, 0], [76, 2, 0], [77, 36, 0]] is too long > > Fixes: 60477435e4de ("arm64: dts: qcom: sm8350: Add SDHCI2") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- This patch is correct, but if 8350 dts mdss [1] gets merged, it will become unnecessary, as it changes icc-cells to 2. Apply with caution i guess :D Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad [1] https://lore.kernel.org/linux-arm-msm/CAG3jFyuoXekXN48jAgXxLMy8yGAzK9oJH_1HHYAuRLBCzyordQ@mail.gmail.com/T/#mdd42dd600f0818ec103daa27c63add6700db86d3 > > Fix for v6.2-rc merge window. > --- > arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi > index 4fc15cc69b8c..0726930c9e28 100644 > --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi > @@ -2382,8 +2382,8 @@ sdhc_2: mmc@8804000 { > <&rpmhcc RPMH_CXO_CLK>; > clock-names = "iface", "core", "xo"; > resets = <&gcc GCC_SDCC2_BCR>; > - interconnects = <&aggre2_noc MASTER_SDCC_2 0 &mc_virt SLAVE_EBI1 0>, > - <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_SDCC_2 0>; > + interconnects = <&aggre2_noc MASTER_SDCC_2 &mc_virt SLAVE_EBI1>, > + <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_SDCC_2>; > interconnect-names = "sdhc-ddr","cpu-sdhc"; > iommus = <&apps_smmu 0x4a0 0x0>; > power-domains = <&rpmhpd SM8350_CX>;
On Tue, Dec 27, 2022 at 12:17:22PM +0100, Konrad Dybcio wrote: > > > On 24.12.2022 22:43, Krzysztof Kozlowski wrote: > > The interconnect providers accept only one argument (cells == 1), so fix > > a copy&paste from SM8450: > > > > sm8350-hdk.dtb: mmc@8804000: interconnects: [[74, 9, 0], [75, 1, 0], [76, 2, 0], [77, 36, 0]] is too long > > > > Fixes: 60477435e4de ("arm64: dts: qcom: sm8350: Add SDHCI2") > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > > > --- > This patch is correct, but if 8350 dts mdss [1] gets merged, it will become > unnecessary, as it changes icc-cells to 2. Apply with caution i guess :D > Seems reasonable to pick this fix for 6.2. Please help me remember to check that [1] gets this right... Thanks Krzysztof. > > Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Thanks, Bjorn > > Konrad > > [1] https://lore.kernel.org/linux-arm-msm/CAG3jFyuoXekXN48jAgXxLMy8yGAzK9oJH_1HHYAuRLBCzyordQ@mail.gmail.com/T/#mdd42dd600f0818ec103daa27c63add6700db86d3 > > > > Fix for v6.2-rc merge window. > > --- > > arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi > > index 4fc15cc69b8c..0726930c9e28 100644 > > --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi > > @@ -2382,8 +2382,8 @@ sdhc_2: mmc@8804000 { > > <&rpmhcc RPMH_CXO_CLK>; > > clock-names = "iface", "core", "xo"; > > resets = <&gcc GCC_SDCC2_BCR>; > > - interconnects = <&aggre2_noc MASTER_SDCC_2 0 &mc_virt SLAVE_EBI1 0>, > > - <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_SDCC_2 0>; > > + interconnects = <&aggre2_noc MASTER_SDCC_2 &mc_virt SLAVE_EBI1>, > > + <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_SDCC_2>; > > interconnect-names = "sdhc-ddr","cpu-sdhc"; > > iommus = <&apps_smmu 0x4a0 0x0>; > > power-domains = <&rpmhpd SM8350_CX>;
On Sat, 24 Dec 2022 22:43:51 +0100, Krzysztof Kozlowski wrote: > The interconnect providers accept only one argument (cells == 1), so fix > a copy&paste from SM8450: > > sm8350-hdk.dtb: mmc@8804000: interconnects: [[74, 9, 0], [75, 1, 0], [76, 2, 0], [77, 36, 0]] is too long > > Applied, thanks! [1/1] arm64: dts: qcom: sm8350: correct SDHCI interconnect arguments commit: 74b91a1bdb994dfaed0074154ca7d493aeb735a6 Best regards,
diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi index 4fc15cc69b8c..0726930c9e28 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -2382,8 +2382,8 @@ sdhc_2: mmc@8804000 { <&rpmhcc RPMH_CXO_CLK>; clock-names = "iface", "core", "xo"; resets = <&gcc GCC_SDCC2_BCR>; - interconnects = <&aggre2_noc MASTER_SDCC_2 0 &mc_virt SLAVE_EBI1 0>, - <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_SDCC_2 0>; + interconnects = <&aggre2_noc MASTER_SDCC_2 &mc_virt SLAVE_EBI1>, + <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_SDCC_2>; interconnect-names = "sdhc-ddr","cpu-sdhc"; iommus = <&apps_smmu 0x4a0 0x0>; power-domains = <&rpmhpd SM8350_CX>;