From nobody Mon Sep 29 21:15:51 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 2F971C00140 for ; Mon, 15 Aug 2022 22:59:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244300AbiHOW7H (ORCPT ); Mon, 15 Aug 2022 18:59:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245390AbiHOW5D (ORCPT ); Mon, 15 Aug 2022 18:57:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E35FB13DEB6; Mon, 15 Aug 2022 12:56:07 -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 AF8D7612AB; Mon, 15 Aug 2022 19:56:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4F12C433C1; Mon, 15 Aug 2022 19:56:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660593366; bh=OSyfKBrxXsTgdjY80p134bk1m5zh9PO+0jzUXMobzCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tAxiE1RCEZssOM5fVH7PZLNOJskkZ8ghnJwdHxMseZ9MdSpNNp5EVWV0LHyuUUZsX QTavrgBX4WJM5vl1Qd43YgvZ9B9dkEILZR4h9K/MEt3qUf8HfO4pvlMvZ3UQKhDYQC eqX8M3ca+M9DTLjTyrSsoX1dGP6g79tBZS434vTo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marijn Suijten , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.19 0257/1157] arm64: dts: qcom: sm6125: Append -state suffix to pinctrl nodes Date: Mon, 15 Aug 2022 19:53:33 +0200 Message-Id: <20220815180449.866874907@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@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: Marijn Suijten [ Upstream commit cbfb5668aece448877fa7826cde81c9d06f4a4ac ] According to qcom,sm6125-pinctrl.yaml all nodes inside the tlmm must be suffixed by -state: qcom/sm6125-sony-xperia-seine-pdx201.dtb: pinctrl@500000: 'sdc2-off', '= sdc2-on' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+' The label names have been updated to match, going from sdc2_state_X to sdc2_X_state. Fixes: cff4bbaf2a2d ("arm64: dts: qcom: Add support for SM6125") Fixes: 82e1783890b7 ("arm64: dts: qcom: sm6125: Add support for Sony Xperia= 10II") Signed-off-by: Marijn Suijten Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20220508100336.127176-2-marijn.suijten@soma= inline.org Signed-off-by: Sasha Levin --- .../boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 4 ++-- arch/arm64/boot/dts/qcom/sm6125.dtsi | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts b= /arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts index 4916e6c8b625..038970c0b68e 100644 --- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts +++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts @@ -88,7 +88,7 @@ &hsusb_phy1 { status =3D "okay"; }; =20 -&sdc2_state_off { +&sdc2_off_state { sd-cd { pins =3D "gpio98"; drive-strength =3D <2>; @@ -96,7 +96,7 @@ sd-cd { }; }; =20 -&sdc2_state_on { +&sdc2_on_state { sd-cd { pins =3D "gpio98"; drive-strength =3D <2>; diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qco= m/sm6125.dtsi index a0d8580739c5..5ee1e4b20301 100644 --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi @@ -386,7 +386,7 @@ tlmm: pinctrl@500000 { interrupt-controller; #interrupt-cells =3D <2>; =20 - sdc2_state_off: sdc2-off { + sdc2_off_state: sdc2-off-state { clk { pins =3D "sdc2_clk"; drive-strength =3D <2>; @@ -406,7 +406,7 @@ data { }; }; =20 - sdc2_state_on: sdc2-on { + sdc2_on_state: sdc2-on-state { clk { pins =3D "sdc2_clk"; drive-strength =3D <16>; @@ -490,8 +490,8 @@ sdhc_2: sdhci@4784000 { <&xo_board>; clock-names =3D "iface", "core", "xo"; =20 - pinctrl-0 =3D <&sdc2_state_on>; - pinctrl-1 =3D <&sdc2_state_off>; + pinctrl-0 =3D <&sdc2_on_state>; + pinctrl-1 =3D <&sdc2_off_state>; pinctrl-names =3D "default", "sleep"; =20 power-domains =3D <&rpmpd SM6125_VDDCX>; --=20 2.35.1