Message ID | 20221204084614.12193-1-krzysztof.kozlowski@linaro.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1706732wrr; Sun, 4 Dec 2022 01:07:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf4MRHD9bRw+x7J9u5dZSIOodtTyTNMp9Y/fgNmfECx26YsId0HLm/mdMCBevKISRFJJKxqq X-Received: by 2002:a63:a05:0:b0:42b:42fb:3da1 with SMTP id 5-20020a630a05000000b0042b42fb3da1mr71680103pgk.538.1670144853612; Sun, 04 Dec 2022 01:07:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670144853; cv=none; d=google.com; s=arc-20160816; b=h7B4mU9zz015gTpoMzrHCt/2slibPpZutwTjcHJ6zNhfca6F+5s8nd858OYBb6a3fQ OBF1epAWqfqJhRc3sjZLHrSpUQ5GY2Cnm2xRKdpcScpS5SxiH195V9oNWDZR4dbbK8Uc imoiKsa9d/MF6/Z68ujKuK2Mv5pe68YemNWmyAJCQkdZ/vdXmcYM6ODtRTbrG6DCjtU5 4R4ZhobJGNPE6bFNjgvKxB7YFKdRb+pqYtAJQ2P0bD8+MxUVrtL5gqDfkIgkmn5Qm0HV yXtJyosoB299hoCZFPKswfudSQCBho/RF4TG65Tc4UMnD4xOyFgN/SK5PSN28XHkxTw9 AmJA== 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=5JSgb59n7yt285OgnTxrX5jNyxDnhai9FpL9TwOkiUQ=; b=C3b7d2yNAeOGf69L0xYLC7KYHtLCbVz5hCDPLBI2dHt+i+Fel+mlh/6uka0abu67cS HzrE0YU1XeFZ6LmjPphrG01j9ZH6UZ+xiHr63obhyLKHhNLOC1u5TYnGo4hxni565dz5 7rlBAqHt9NBcs0erQAwGy7Jd0XPUtBbiOEbd/6zLjAzSPD58USrmhbyjG+zNNagi4Gp3 L67Zb/dyy9Rp7HrNyMMSgjuWuDU8EwTF1MV2bJYXjE5ItU2cIP22EWPXiHk5msY76/EO a9NZDkqY9KvDavseq/793hPOZ6wIOovps+2ZTIql3Bt+rZC0ArLIIAYFLTWrsC4117qj SUJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E8VTCpcK; 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 207-20020a6302d8000000b00477663f69ffsi13097116pgc.624.2022.12.04.01.07.19; Sun, 04 Dec 2022 01:07:33 -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=E8VTCpcK; 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 S229990AbiLDIqZ (ORCPT <rfc822;jaysivo@gmail.com> + 99 others); Sun, 4 Dec 2022 03:46:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229983AbiLDIqW (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 4 Dec 2022 03:46:22 -0500 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74C941788D for <linux-kernel@vger.kernel.org>; Sun, 4 Dec 2022 00:46:20 -0800 (PST) Received: by mail-lf1-x129.google.com with SMTP id b3so14070176lfv.2 for <linux-kernel@vger.kernel.org>; Sun, 04 Dec 2022 00:46:20 -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=5JSgb59n7yt285OgnTxrX5jNyxDnhai9FpL9TwOkiUQ=; b=E8VTCpcK8U1SYdCoZDpb8MUs+oDGPLLSRjA9wrjxylnZsd1deUIKA/05f4FwxXgDzq dFp1FlNdOVBwbv7nXas8aD2swC8DZGkoHZjs5WmLt+HBwwjNVUVAhCegzoFJ9Rk58rb+ Xk1JnQJnfwRHTpvbRbNFkNIW7uWaS7igIJ/xD7rynjjXFF+QxIODoVOLl3mzg8bOrBuS pj2NcN4aG0lDpqLV0R+zMnHCwrxNxtvZGBqPcpjtcjdnTAfyinmiK+k6aLZrmo/0srEg lRDMCt9a/OzwmFX5ukqbGVjFMt3YyFLO4YeNrYaXaH8E4Cp2i9boQvTguwZYlA708RWy o7uA== 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=5JSgb59n7yt285OgnTxrX5jNyxDnhai9FpL9TwOkiUQ=; b=RW6JLqs935IIpvi3x0SbVRa2RdVcJSJmoMTgGuUIe1ITBK3lmkHpnhuzEfqLZY1btH wvFHpPhBypoJTTpwGeFD7RGEiI6lxbABVKxOFSS5gJnN+Z+TD9z5Y3zk+3/pFNBthG19 3ql/4HjQseXj7iydXcJf/V+rPoKoywSBUOWlECOBG+X3j+4tQP+bCc0N7Tec66Ov35xO c71zBIvHmvlzVs7F1Z9URNQcWWdAUVaaDcuhqqCqGjqp6WkgSw4OI/u4if4C/swgmZfj kgmKv7lchG4+p2e1qaR9C57QlK5qYYP5u+FgVdUdYVfYD1WFlgblLw0WeQEgQOYN2D2I kTpA== X-Gm-Message-State: ANoB5pmCj8YM2TU6rCejsZUA6Xvo83FWfeXdkmmlaqZbkRA2h3Up5NYk KRsFicdV0Ji/W16phwAlOm52iQ== X-Received: by 2002:ac2:4bd4:0:b0:4b4:aed7:4aa5 with SMTP id o20-20020ac24bd4000000b004b4aed74aa5mr19490634lfq.447.1670143578832; Sun, 04 Dec 2022 00:46:18 -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 f20-20020ac25cd4000000b004b4bae1a05asm1680759lfq.293.2022.12.04.00.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 00:46:18 -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>, Bhupesh Sharma <bhupesh.sharma@linaro.org>, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>, stable@vger.kernel.org Subject: [PATCH] ARM: dts: qcom: apq8084-ifc6540: fix overriding SDHCI Date: Sun, 4 Dec 2022 09:46:14 +0100 Message-Id: <20221204084614.12193-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?1751273810316626893?= X-GMAIL-MSGID: =?utf-8?q?1751273810316626893?= |
Series |
ARM: dts: qcom: apq8084-ifc6540: fix overriding SDHCI
|
|
Commit Message
Krzysztof Kozlowski
Dec. 4, 2022, 8:46 a.m. UTC
While changing node names of APQ8084 SDHCI, the ones in IFC6540 board
were not updated leading to disabled and misconfigured SDHCI.
Cc: <stable@vger.kernel.org>
Fixes: 2477d81901a2 ("ARM: dts: qcom: Fix sdhci node names - use 'mmc@'")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 20 ++++++++++----------
arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
Comments
On Sun, 4 Dec 2022 at 10:46, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > While changing node names of APQ8084 SDHCI, the ones in IFC6540 board > were not updated leading to disabled and misconfigured SDHCI. > > Cc: <stable@vger.kernel.org> > Fixes: 2477d81901a2 ("ARM: dts: qcom: Fix sdhci node names - use 'mmc@'") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Minor nit below. > --- > arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 20 ++++++++++---------- > arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++-- > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts > index 44cd72f1b1be..116e59a3b76d 100644 > --- a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts > +++ b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts > @@ -19,16 +19,16 @@ soc { > serial@f995e000 { > status = "okay"; > }; > + }; > +}; > > - sdhci@f9824900 { > - bus-width = <8>; > - non-removable; > - status = "okay"; > - }; > +&sdhc_1 { > + bus-width = <8>; > + non-removable; > + status = "okay"; > +}; > > - sdhci@f98a4900 { > - cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>; > - bus-width = <4>; > - }; > - }; > +&sdhc_2 { > + cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>; > + bus-width = <4>; Technically this will still be disabled, as there is no 'status = "okay";' here. > }; > diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi > index fe30abfff90a..4b0d2b4f4b6a 100644 > --- a/arch/arm/boot/dts/qcom-apq8084.dtsi > +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi > @@ -421,7 +421,7 @@ blsp2_uart2: serial@f995e000 { > status = "disabled"; > }; > > - mmc@f9824900 { > + sdhc_1: mmc@f9824900 { > compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"; > reg = <0xf9824900 0x11c>, <0xf9824000 0x800>; > reg-names = "hc", "core"; > @@ -434,7 +434,7 @@ mmc@f9824900 { > status = "disabled"; > }; > > - mmc@f98a4900 { > + sdhc_2: mmc@f98a4900 { > compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"; > reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>; > reg-names = "hc", "core"; > -- > 2.34.1 >
On 04/12/2022 12:11, Dmitry Baryshkov wrote: > On Sun, 4 Dec 2022 at 10:46, Krzysztof Kozlowski > <krzysztof.kozlowski@linaro.org> wrote: >> >> While changing node names of APQ8084 SDHCI, the ones in IFC6540 board >> were not updated leading to disabled and misconfigured SDHCI. >> >> Cc: <stable@vger.kernel.org> >> Fixes: 2477d81901a2 ("ARM: dts: qcom: Fix sdhci node names - use 'mmc@'") >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > Minor nit below. > >> --- >> arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 20 ++++++++++---------- >> arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++-- >> 2 files changed, 12 insertions(+), 12 deletions(-) >> >> diff --git a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts >> index 44cd72f1b1be..116e59a3b76d 100644 >> --- a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts >> +++ b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts >> @@ -19,16 +19,16 @@ soc { >> serial@f995e000 { >> status = "okay"; >> }; >> + }; >> +}; >> >> - sdhci@f9824900 { >> - bus-width = <8>; >> - non-removable; >> - status = "okay"; >> - }; >> +&sdhc_1 { >> + bus-width = <8>; >> + non-removable; >> + status = "okay"; >> +}; >> >> - sdhci@f98a4900 { >> - cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>; >> - bus-width = <4>; >> - }; >> - }; >> +&sdhc_2 { >> + cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>; >> + bus-width = <4>; > > Technically this will still be disabled, as there is no 'status = "okay";' here. > Yes, but I think this is separate issue, not related to node renaming. The initial patch which added these said: "required for enabling the serial port and eMMC." so I assume SD card controller was meant to stay disabled. Best regards, Krzysztof
On Sun, 4 Dec 2022 09:46:14 +0100, Krzysztof Kozlowski wrote: > While changing node names of APQ8084 SDHCI, the ones in IFC6540 board > were not updated leading to disabled and misconfigured SDHCI. > > Applied, thanks! [1/1] ARM: dts: qcom: apq8084-ifc6540: fix overriding SDHCI commit: 0154252a3b87f77db1e44516d1ed2e82e2d29c30 Best regards,
diff --git a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts index 44cd72f1b1be..116e59a3b76d 100644 --- a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts +++ b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts @@ -19,16 +19,16 @@ soc { serial@f995e000 { status = "okay"; }; + }; +}; - sdhci@f9824900 { - bus-width = <8>; - non-removable; - status = "okay"; - }; +&sdhc_1 { + bus-width = <8>; + non-removable; + status = "okay"; +}; - sdhci@f98a4900 { - cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>; - bus-width = <4>; - }; - }; +&sdhc_2 { + cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>; + bus-width = <4>; }; diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi index fe30abfff90a..4b0d2b4f4b6a 100644 --- a/arch/arm/boot/dts/qcom-apq8084.dtsi +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi @@ -421,7 +421,7 @@ blsp2_uart2: serial@f995e000 { status = "disabled"; }; - mmc@f9824900 { + sdhc_1: mmc@f9824900 { compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"; reg = <0xf9824900 0x11c>, <0xf9824000 0x800>; reg-names = "hc", "core"; @@ -434,7 +434,7 @@ mmc@f9824900 { status = "disabled"; }; - mmc@f98a4900 { + sdhc_2: mmc@f98a4900 { compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"; reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>; reg-names = "hc", "core";