From nobody Wed Sep 17 23:47:50 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 DBA58C4332F for ; Wed, 14 Dec 2022 17:13:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237947AbiLNRNe (ORCPT ); Wed, 14 Dec 2022 12:13:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230004AbiLNRN3 (ORCPT ); Wed, 14 Dec 2022 12:13:29 -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 A28A726573 for ; Wed, 14 Dec 2022 09:12:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671037922; 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=ViPUo5RSC1lOfFH6js8lwSLNuz2X1DayNZ3oP43BQUE=; b=DBvkfog51ZySIiXkAOksc0/oey21r1agoxXWNXLlwz/P2fRCI7XXRU25ASB7ie/GCFp5yn FVv1VGJx+hIaLG5o/iqQmwi3e0OanHsQjlVl2JEpMmn+XIUi/A1PzmSmrScDtfKO9BJUp5 CD3dOSUai7Qj1sBx95BP/lISf7v5QW4= Received: from mail-yw1-f198.google.com (mail-yw1-f198.google.com [209.85.128.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-137-RRlQdNTkOk663wupc5gqnw-1; Wed, 14 Dec 2022 12:12:01 -0500 X-MC-Unique: RRlQdNTkOk663wupc5gqnw-1 Received: by mail-yw1-f198.google.com with SMTP id 00721157ae682-348608c1cd3so4587557b3.10 for ; Wed, 14 Dec 2022 09:12:01 -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=ViPUo5RSC1lOfFH6js8lwSLNuz2X1DayNZ3oP43BQUE=; b=kRc8XA2FwgKgj2oUjAxE1Y8jQcH6xLhOrS3uo9CaTT3NanKYuFypCM3yxJkkDWEkgo PgaSMboNH65NV7c47Z39V+lZuvvpbKG3a7H/y0EN4lgAun1KXCIdv89cN2DGo/iGljeW tFB+Mam+EFXn7VgJuPYeB5HC3fpousRVZGDrswuaoxeoIMRSxSE5UaCjITyl3wkxpMlW wMhDt9h8ELIYT2qeTgQAAFIIVgTpT8No1UH3024M0WHXuS1H0suvSFAk8bnZGomybGyW gak6jnUy+pb46L7xFPUTaBf3fsgWy8nr55RM7kVm9dUxUr5TpX3DCT/MsxICxjDU/nwn YDbg== X-Gm-Message-State: ANoB5pkRaxKpv+JzrlhqCYZCOjV5UHYijgOxmZGCKPeHajEqShvx7Siq Ny0xxYYUDmzeXGJTiNCZfJ4QkVTjTXfqIMQnb24BuzwJQG0KSwEF5PodSdpRlPu6nF+z92Q6jDp RiUocAILMtAsJ7yCdQvczg6Ri X-Received: by 2002:a05:7500:b8e:b0:eb:2ca:b87a with SMTP id fx14-20020a0575000b8e00b000eb02cab87amr2699494gab.56.1671037920488; Wed, 14 Dec 2022 09:12:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf5/D+8Llah6uyulxiUSnqmaPv4usKNf7Fw7SiI7MHsWoGj3T4BrDfrSP2E3SCQJ2bS/C6K4nQ== X-Received: by 2002:a05:7500:b8e:b0:eb:2ca:b87a with SMTP id fx14-20020a0575000b8e00b000eb02cab87amr2699462gab.56.1671037920061; Wed, 14 Dec 2022 09:12:00 -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 t30-20020a37ea1e000000b006eef13ef4c8sm10305477qkj.94.2022.12.14.09.11.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 09:11:59 -0800 (PST) From: Brian Masney To: andersson@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: quic_shazhuss@quicinc.com, 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 Subject: [PATCH v2 2/7] arm64: dts: qcom: sc8280xp: rename qup2_i2c5 to i2c21 Date: Wed, 14 Dec 2022 12:11:40 -0500 Message-Id: <20221214171145.2913557-3-bmasney@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214171145.2913557-1-bmasney@redhat.com> References: <20221214171145.2913557-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" In preparation for adding the missing SPI and I2C nodes to sc8280xp.dtsi, it was decided to rename all of the existing qupX_ uart, spi, and i2c nodes to drop the qupX_ prefix. Let's go ahead and rename qup2_i2c5 to i2c21. Under the old name, this was the 5th index under qup2, which starts at index 16. Note that some nodes are moved in the file by this patch to preserve the expected sort order in the file. Signed-off-by: Brian Masney Link: https://lore.kernel.org/lkml/20221212182314.1902632-1-bmasney@redhat.= com/ Reviewed-by: Konrad Dybcio --- This is a new patch that's introduced in v2. arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 90 ++++++------- .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 120 +++++++++--------- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +- 3 files changed, 106 insertions(+), 106 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dt= s/qcom/sc8280xp-crd.dts index db273face248..0de1bdb68e2c 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -228,6 +228,43 @@ vreg_l9d: ldo9 { }; }; =20 +&i2c21 { + clock-frequency =3D <400000>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c21_default>; + + status =3D "okay"; + + touchpad@15 { + compatible =3D "hid-over-i2c"; + reg =3D <0x15>; + + hid-descr-addr =3D <0x1>; + interrupts-extended =3D <&tlmm 182 IRQ_TYPE_LEVEL_LOW>; + vdd-supply =3D <&vreg_misc_3p3>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&tpad_default>; + + wakeup-source; + }; + + keyboard@68 { + compatible =3D "hid-over-i2c"; + reg =3D <0x68>; + + hid-descr-addr =3D <0x1>; + interrupts-extended =3D <&tlmm 104 IRQ_TYPE_LEVEL_LOW>; + vdd-supply =3D <&vreg_misc_3p3>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&kybd_default>; + + wakeup-source; + }; +}; + &pcie2a { perst-gpios =3D <&tlmm 143 GPIO_ACTIVE_LOW>; wake-gpios =3D <&tlmm 145 GPIO_ACTIVE_LOW>; @@ -326,43 +363,6 @@ &qup2 { status =3D "okay"; }; =20 -&qup2_i2c5 { - clock-frequency =3D <400000>; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&qup2_i2c5_default>; - - status =3D "okay"; - - touchpad@15 { - compatible =3D "hid-over-i2c"; - reg =3D <0x15>; - - hid-descr-addr =3D <0x1>; - interrupts-extended =3D <&tlmm 182 IRQ_TYPE_LEVEL_LOW>; - vdd-supply =3D <&vreg_misc_3p3>; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&tpad_default>; - - wakeup-source; - }; - - keyboard@68 { - compatible =3D "hid-over-i2c"; - reg =3D <0x68>; - - hid-descr-addr =3D <0x1>; - interrupts-extended =3D <&tlmm 104 IRQ_TYPE_LEVEL_LOW>; - vdd-supply =3D <&vreg_misc_3p3>; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&kybd_default>; - - wakeup-source; - }; -}; - &remoteproc_adsp { firmware-name =3D "qcom/sc8280xp/qcadsp8280.mbn"; =20 @@ -494,6 +494,14 @@ hastings_reg_en: hastings-reg-en-state { &tlmm { gpio-reserved-ranges =3D <74 6>, <83 4>, <125 2>, <128 2>, <154 7>; =20 + i2c21_default: i2c21-default-state { + pins =3D "gpio81", "gpio82"; + function =3D "qup21"; + + bias-disable; + drive-strength =3D <16>; + }; + kybd_default: kybd-default-state { disable-pins { pins =3D "gpio102"; @@ -598,14 +606,6 @@ qup0_i2c4_default: qup0-i2c4-default-state { drive-strength =3D <16>; }; =20 - qup2_i2c5_default: qup2-i2c5-default-state { - pins =3D "gpio81", "gpio82"; - function =3D "qup21"; - - bias-disable; - drive-strength =3D <16>; - }; - tpad_default: tpad-default-state { int-n-pins { pins =3D "gpio182"; 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..d7af2040cbcb 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -282,6 +282,59 @@ vreg_l9d: ldo9 { }; }; =20 +&i2c21 { + clock-frequency =3D <400000>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c21_default>; + + status =3D "okay"; + + touchpad@15 { + compatible =3D "hid-over-i2c"; + reg =3D <0x15>; + + hid-descr-addr =3D <0x1>; + interrupts-extended =3D <&tlmm 182 IRQ_TYPE_LEVEL_LOW>; + vdd-supply =3D <&vreg_misc_3p3>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&tpad_default>; + + wakeup-source; + + status =3D "disabled"; + }; + + touchpad@2c { + compatible =3D "hid-over-i2c"; + reg =3D <0x2c>; + + hid-descr-addr =3D <0x20>; + interrupts-extended =3D <&tlmm 182 IRQ_TYPE_LEVEL_LOW>; + vdd-supply =3D <&vreg_misc_3p3>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&tpad_default>; + + wakeup-source; + }; + + keyboard@68 { + compatible =3D "hid-over-i2c"; + reg =3D <0x68>; + + hid-descr-addr =3D <0x1>; + interrupts-extended =3D <&tlmm 104 IRQ_TYPE_LEVEL_LOW>; + vdd-supply =3D <&vreg_misc_3p3>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&kybd_default>; + + wakeup-source; + }; +}; + &pcie2a { perst-gpios =3D <&tlmm 143 GPIO_ACTIVE_LOW>; wake-gpios =3D <&tlmm 145 GPIO_ACTIVE_LOW>; @@ -531,59 +584,6 @@ &qup2 { status =3D "okay"; }; =20 -&qup2_i2c5 { - clock-frequency =3D <400000>; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&qup2_i2c5_default>; - - status =3D "okay"; - - touchpad@15 { - compatible =3D "hid-over-i2c"; - reg =3D <0x15>; - - hid-descr-addr =3D <0x1>; - interrupts-extended =3D <&tlmm 182 IRQ_TYPE_LEVEL_LOW>; - vdd-supply =3D <&vreg_misc_3p3>; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&tpad_default>; - - wakeup-source; - - status =3D "disabled"; - }; - - touchpad@2c { - compatible =3D "hid-over-i2c"; - reg =3D <0x2c>; - - hid-descr-addr =3D <0x20>; - interrupts-extended =3D <&tlmm 182 IRQ_TYPE_LEVEL_LOW>; - vdd-supply =3D <&vreg_misc_3p3>; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&tpad_default>; - - wakeup-source; - }; - - keyboard@68 { - compatible =3D "hid-over-i2c"; - reg =3D <0x68>; - - hid-descr-addr =3D <0x1>; - interrupts-extended =3D <&tlmm 104 IRQ_TYPE_LEVEL_LOW>; - vdd-supply =3D <&vreg_misc_3p3>; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&kybd_default>; - - wakeup-source; - }; -}; - &remoteproc_adsp { firmware-name =3D "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn"; =20 @@ -698,6 +698,13 @@ hall_int_n_default: hall-int-n-state { bias-disable; }; =20 + i2c21_default: i2c21-default-state { + pins =3D "gpio81", "gpio82"; + function =3D "qup21"; + bias-disable; + drive-strength =3D <16>; + }; + kybd_default: kybd-default-state { disable-pins { pins =3D "gpio102"; @@ -801,13 +808,6 @@ qup0_i2c4_default: qup0-i2c4-default-state { drive-strength =3D <16>; }; =20 - qup2_i2c5_default: qup2-i2c5-default-state { - pins =3D "gpio81", "gpio82"; - function =3D "qup21"; - bias-disable; - drive-strength =3D <16>; - }; - tpad_default: tpad-default-state { int-n-pins { pins =3D "gpio182"; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/q= com/sc8280xp.dtsi index 951cb1b6fcc4..929365cff555 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -827,7 +827,7 @@ uart17: serial@884000 { status =3D "disabled"; }; =20 - qup2_i2c5: i2c@894000 { + i2c21: i2c@894000 { compatible =3D "qcom,geni-i2c"; reg =3D <0 0x00894000 0 0x4000>; clock-names =3D "se"; --=20 2.38.1