From nobody Fri Oct 24 20:32:39 2025 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 57938C3F6B0 for ; Mon, 15 Aug 2022 20:43:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346230AbiHOUlR (ORCPT ); Mon, 15 Aug 2022 16:41:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346097AbiHOUff (ORCPT ); Mon, 15 Aug 2022 16:35:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3EE82CCB1; Mon, 15 Aug 2022 12:06:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 531FC61281; Mon, 15 Aug 2022 19:06:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55A8CC433C1; Mon, 15 Aug 2022 19:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660590399; bh=KllhjJV9VouH/3ISnHcF6h0zQoJcICFh8bxb8Ionq+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BYJMGEFOqQ9y3sCUX4y+80SVAnxnTQCivz91rOoobSkz8rjYiTzSUsRF9qoLjiN+4 Hjmog4cdGdjSsXlx5oGlpY/0GxHlAd17IACQKl4YrBfnDe5DQcNsbNCSkJ6dvX0rz/ 731TZeFZyrtSGGGFhzHTYiSsE2S1P/cyNrM5DPgw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Konrad Dybcio , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.18 0230/1095] ARM: dts: qcom-msm8974: Fix up SDHCI nodes Date: Mon, 15 Aug 2022 19:53:49 +0200 Message-Id: <20220815180439.252974319@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Konrad Dybcio [ Upstream commit 64cf62683b5398e46cf967c308be95685137626a ] - Add missing labels (and remove their redefinition from klte) - Commonize bus-width - Add non-removable on sdhc_1, as it's supposed to have an eMMC on it Signed-off-by: Konrad Dybcio Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20220415115633.575010-7-konrad.dybcio@somai= nline.org Signed-off-by: Sasha Levin --- arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 4 ++-- arch/arm/boot/dts/qcom-msm8974.dtsi | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boo= t/dts/qcom-msm8974-samsung-klte.dts index 95ae30d06554..3ee2508b20fb 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -534,7 +534,7 @@ te { }; }; =20 - sdhc_1: sdhci@f9824900 { + sdhci@f9824900 { status =3D "okay"; =20 vmmc-supply =3D <&pma8084_l20>; @@ -547,7 +547,7 @@ sdhc_1: sdhci@f9824900 { pinctrl-0 =3D <&sdhc1_pin_a>; }; =20 - sdhc_2: sdhci@f9864900 { + sdhci@f9864900 { status =3D "okay"; =20 max-frequency =3D <100000000>; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-m= sm8974.dtsi index 2d54d18310da..d8a1ba5b845c 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -742,7 +742,7 @@ blsp2_uart4: serial@f9960000 { status =3D "disabled"; }; =20 - sdhci@f9824900 { + sdhc_1: sdhci@f9824900 { compatible =3D "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf9824900 0x11c>, <0xf9824000 0x800>; reg-names =3D "hc_mem", "core_mem"; @@ -753,10 +753,13 @@ sdhci@f9824900 { <&gcc GCC_SDCC1_AHB_CLK>, <&xo_board>; clock-names =3D "core", "iface", "xo"; + bus-width =3D <8>; + non-removable; + status =3D "disabled"; }; =20 - sdhci@f9864900 { + sdhc_3: sdhci@f9864900 { compatible =3D "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf9864900 0x11c>, <0xf9864000 0x800>; reg-names =3D "hc_mem", "core_mem"; @@ -767,10 +770,12 @@ sdhci@f9864900 { <&gcc GCC_SDCC3_AHB_CLK>, <&xo_board>; clock-names =3D "core", "iface", "xo"; + bus-width =3D <4>; + status =3D "disabled"; }; =20 - sdhci@f98a4900 { + sdhc_2: sdhci@f98a4900 { compatible =3D "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf98a4900 0x11c>, <0xf98a4000 0x800>; reg-names =3D "hc_mem", "core_mem"; @@ -781,6 +786,8 @@ sdhci@f98a4900 { <&gcc GCC_SDCC2_AHB_CLK>, <&xo_board>; clock-names =3D "core", "iface", "xo"; + bus-width =3D <4>; + status =3D "disabled"; }; =20 --=20 2.35.1