From nobody Thu Sep 18 02:38:00 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 2F8EBC4332F for ; Mon, 12 Dec 2022 18:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232770AbiLLSYa (ORCPT ); Mon, 12 Dec 2022 13:24:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229629AbiLLSY1 (ORCPT ); Mon, 12 Dec 2022 13:24:27 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04824FCE3 for ; Mon, 12 Dec 2022 10:23:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670869406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=59XhlXC9Hqnb96mVLMejnqpQvDSEyia1t81oDMf3rF4=; b=JTqEjX9u/lH16XVhEiV+/9XndK9++qBr2U7akzfLigLMjIFyqq2QoJYqEf+YKcRbqUqaMJ g6o9PJ6h5gAgFga90c8IkZYlLW9rnVr9M7ueI28uv2NYzk/f11XJLXB8yFswLvfmbthg0a sQWOv+lazotG30ZWtsT1DlowO3vjXTI= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-573-ZIqPxkjaMsSVx_1AIivwsg-1; Mon, 12 Dec 2022 13:23:24 -0500 X-MC-Unique: ZIqPxkjaMsSVx_1AIivwsg-1 Received: by mail-qt1-f199.google.com with SMTP id fw8-20020a05622a4a8800b003a64f82fe73so12224816qtb.3 for ; Mon, 12 Dec 2022 10:23:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=59XhlXC9Hqnb96mVLMejnqpQvDSEyia1t81oDMf3rF4=; b=op5i+VSjNPYzy2unElCJQhvhcdyda4TEUwE1YrGXlwI1LHUA1pWooati96YX14yEeL TxWtTafzR18nXLOyNMs8iSeI7VtFipqCoEzm7ZtpgWmLt0OwCOFQkHlgIABHrkz14WHd tvH45bjGV/pT/banKi5Ke9eyrgVL0F/z4GN2EZRFuARR27SSLFN3okJmzqlJj56Qg5KQ lTdyftWYxwtxnO07529oDKwBjS6kcaIyL60/mR3XksPjXawxbUUIdHJg0I4VB9+JP3jT sSwYPrZecPf5UnO47+yTQLV8ccgRqi48Mf7De9u26ZM8c98dmWbFo8MoFD5YLT4kKnow ySfQ== X-Gm-Message-State: ANoB5pnp5OJ5+prJrG4VAWLJ1wcV8UnZY3A5EHtYPXmeO/sjR+jF/Sy1 uSF2tRpUWvYITwMrozSPIf5YDJFX6p2T3YppXI+/9FmA2nX+7echgyzq8rZoNDxxgl+i2HGYbfZ pvgOznpGAbrBZKFVkT53ILpIL X-Received: by 2002:ac8:708b:0:b0:3a8:1ba:b8ab with SMTP id y11-20020ac8708b000000b003a801bab8abmr21142501qto.6.1670869404410; Mon, 12 Dec 2022 10:23:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf5UXhj3fdLVAh/KYD8/5J50NlN2rNT2F471pyVk9QirermmRj3iIa+JnNhXUrQjNjJcqJkxFA== X-Received: by 2002:ac8:708b:0:b0:3a8:1ba:b8ab with SMTP id y11-20020ac8708b000000b003a801bab8abmr21142482qto.6.1670869404215; Mon, 12 Dec 2022 10:23:24 -0800 (PST) Received: from x1.redhat.com (c-73-214-169-22.hsd1.pa.comcast.net. [73.214.169.22]) by smtp.gmail.com with ESMTPSA id 3-20020ac85643000000b003a816011d51sm1998185qtt.38.2022.12.12.10.23.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 10:23:23 -0800 (PST) From: Brian Masney To: andersson@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: konrad.dybcio@linaro.org, robh+dt@kernel.org, johan+linaro@kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ahalaney@redhat.com, echanude@redhat.com, quic_shazhuss@quicinc.com Subject: [PATCH 1/4] arm64: dts: qcom: sc8280xp: rename i2c5 to i2c21 Date: Mon, 12 Dec 2022 13:23:11 -0500 Message-Id: <20221212182314.1902632-2-bmasney@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212182314.1902632-1-bmasney@redhat.com> References: <20221212182314.1902632-1-bmasney@redhat.com> 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" According to the downstream 5.4 kernel sources for the sa8540p, i2c@894000 is labeled i2c bus 21, not 5. The interrupts and clocks also match. Let's go ahead and correct the name that's used in the three files where this is listed. Signed-off-by: Brian Masney Fixes: 152d1faf1e2f3 ("arm64: dts: qcom: add SC8280XP platform") Fixes: ccd3517faf183 ("arm64: dts: qcom: sc8280xp: Add reference device") Fixes: 32c231385ed43 ("arm64: dts: qcom: sc8280xp: add Lenovo Thinkpad X13s= devicetree") Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 6 +++--- arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 6 +++--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dt= s/qcom/sc8280xp-crd.dts index 551768f97729..1ab76724144d 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -326,11 +326,11 @@ &qup2 { status =3D "okay"; }; =20 -&qup2_i2c5 { +&qup2_i2c21 { clock-frequency =3D <400000>; =20 pinctrl-names =3D "default"; - pinctrl-0 =3D <&qup2_i2c5_default>; + pinctrl-0 =3D <&qup2_i2c21_default>; =20 status =3D "okay"; =20 @@ -598,7 +598,7 @@ qup0_i2c4_default: qup0-i2c4-default-state { drive-strength =3D <16>; }; =20 - qup2_i2c5_default: qup2-i2c5-default-state { + qup2_i2c21_default: qup2-i2c21-default-state { pins =3D "gpio81", "gpio82"; function =3D "qup21"; =20 diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/a= rch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 568c6be1ceaa..284adf60386a 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -531,11 +531,11 @@ &qup2 { status =3D "okay"; }; =20 -&qup2_i2c5 { +&qup2_i2c21 { clock-frequency =3D <400000>; =20 pinctrl-names =3D "default"; - pinctrl-0 =3D <&qup2_i2c5_default>; + pinctrl-0 =3D <&qup2_i2c21_default>; =20 status =3D "okay"; =20 @@ -801,7 +801,7 @@ qup0_i2c4_default: qup0-i2c4-default-state { drive-strength =3D <16>; }; =20 - qup2_i2c5_default: qup2-i2c5-default-state { + qup2_i2c21_default: qup2-i2c21-default-state { pins =3D "gpio81", "gpio82"; function =3D "qup21"; bias-disable; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/q= com/sc8280xp.dtsi index 109c9d2b684d..875cc91324ce 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -827,7 +827,7 @@ qup2_uart17: serial@884000 { status =3D "disabled"; }; =20 - qup2_i2c5: i2c@894000 { + qup2_i2c21: i2c@894000 { compatible =3D "qcom,geni-i2c"; reg =3D <0 0x00894000 0 0x4000>; clock-names =3D "se"; --=20 2.38.1