From nobody Fri Dec 19 17:42:10 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 4D1D1C4167B for ; Tue, 20 Dec 2022 19:30:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233665AbiLTTaG (ORCPT ); Tue, 20 Dec 2022 14:30:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234067AbiLTT3y (ORCPT ); Tue, 20 Dec 2022 14:29:54 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D4621D66F for ; Tue, 20 Dec 2022 11:29:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671564546; 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=BxJkhXJ88Dr+809fXkqOoDAQkFxQM5nGSrXbKhgpBTk=; b=V7fgnSrj1vqXhYIQIUu8wYGaat0qpZ14kuLH0RKTx++WpGusa3vQRoRplL52EvKIDL4vaR IyV82EHAVMy9Zsk0cuwiVa2Mz+JZo135RNoGp9C2fUrFDJZoUdi4sXhlpIRDZJP0z9dexb rCr/4lJlKDlgKTJvJITK68X0aEUizUA= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-632-yaFTHGlpMM21M-epvBURGQ-1; Tue, 20 Dec 2022 14:29:04 -0500 X-MC-Unique: yaFTHGlpMM21M-epvBURGQ-1 Received: by mail-qk1-f199.google.com with SMTP id v7-20020a05620a0f0700b006faffce43b2so9945626qkl.9 for ; Tue, 20 Dec 2022 11:29:04 -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=BxJkhXJ88Dr+809fXkqOoDAQkFxQM5nGSrXbKhgpBTk=; b=h1iZ5c+Fuh5vf+uYww0jmpYbe6t8rgL0WsNtAT/lIFDrxUU9oT0hpCFSREpYy3QozY 7L9lXNOUHUzcMS37qIXkSQZVoHWAtMmdqdDE3hufmP0CG0ToSqnfkQEfAfyD4KaItrDl 23eGO21aLlau/rWrIIciVzhCjF42dXc/SE+VI7swa5UKrgQEEMQyjb6L7ovLzCPEjxHL b1t/1pbs8Stv/aOZE/BUE67tsWM3/p9TGN6QzJKNwwUR1ECjNQs/gGAi5kjhxteh/jS0 bFou2hf5cZibit6VHXHZJJEt7kHyvovnV34b1HnZSKEibnwl7EIg7fFl0zK4O+zbOFMK zSEg== X-Gm-Message-State: ANoB5pkKwaryMyknuDP4j5fsm4IoBNPWz/NZB9ldbaU5eiZJkswwVgrF 2/cPPW8xXTWN3IXq/kNGZiG3poefBfZWYdVQYmTYHjviwmvOx6Q+2/4d3cFIYnsJwZJzsDhZMXa JKTv7OWzOEPj0j+agsHVQ+LMH X-Received: by 2002:ac8:488e:0:b0:3a8:1793:76d6 with SMTP id i14-20020ac8488e000000b003a8179376d6mr41479715qtq.68.1671564544181; Tue, 20 Dec 2022 11:29:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Iq0LU3SMOYgbfAr8eLzK6qtHdFB8ucI+2+US/Q0uIkY/W28YmvX5Ej+e+PRnkMQVuSDKIbQ== X-Received: by 2002:ac8:488e:0:b0:3a8:1793:76d6 with SMTP id i14-20020ac8488e000000b003a8179376d6mr41479695qtq.68.1671564543948; Tue, 20 Dec 2022 11:29:03 -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 gd15-20020a05622a5c0f00b003a82ca4e81csm744348qtb.80.2022.12.20.11.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 11:29:03 -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 v3 1/7] arm64: dts: qcom: sc8280xp: rename qup2_uart17 to uart17 Date: Tue, 20 Dec 2022 14:28:48 -0500 Message-Id: <20221220192854.521647-2-bmasney@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220192854.521647-1-bmasney@redhat.com> References: <20221220192854.521647-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_uart17 to uart17. 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 Reviewed-by: Johan Hovold --- Changes from v2 to v3: - Add Konrad's R-b Patch introduced in v2 arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 12 ++++++------ arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 12 ++++++------ arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 14 +++++++------- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts= /qcom/sa8295p-adp.dts index 84cb6f3eeb56..61f2e44e70c1 100644 --- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts +++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts @@ -17,7 +17,7 @@ / { compatible =3D "qcom,sa8295p-adp", "qcom,sa8540p"; =20 aliases { - serial0 =3D &qup2_uart17; + serial0 =3D &uart17; }; =20 chosen { @@ -240,11 +240,6 @@ &qup2 { status =3D "okay"; }; =20 -&qup2_uart17 { - compatible =3D "qcom,geni-debug-uart"; - status =3D "okay"; -}; - &remoteproc_adsp { firmware-name =3D "qcom/sa8540p/adsp.mbn"; status =3D "okay"; @@ -338,6 +333,11 @@ pm8450g_gpios: gpio@c000 { }; }; =20 +&uart17 { + compatible =3D "qcom,geni-debug-uart"; + status =3D "okay"; +}; + &ufs_mem_hc { reset-gpios =3D <&tlmm 228 GPIO_ACTIVE_LOW>; =20 diff --git a/arch/arm64/boot/dts/qcom/sa8540p-ride.dts b/arch/arm64/boot/dt= s/qcom/sa8540p-ride.dts index 21f3ff024910..b6e0db5508c7 100644 --- a/arch/arm64/boot/dts/qcom/sa8540p-ride.dts +++ b/arch/arm64/boot/dts/qcom/sa8540p-ride.dts @@ -17,7 +17,7 @@ / { compatible =3D "qcom,sa8540p-ride", "qcom,sa8540p"; =20 aliases { - serial0 =3D &qup2_uart17; + serial0 =3D &uart17; }; =20 chosen { @@ -192,11 +192,6 @@ &qup2 { status =3D "okay"; }; =20 -&qup2_uart17 { - compatible =3D "qcom,geni-debug-uart"; - status =3D "okay"; -}; - &remoteproc_nsp0 { firmware-name =3D "qcom/sa8540p/cdsp.mbn"; status =3D "okay"; @@ -207,6 +202,11 @@ &remoteproc_nsp1 { status =3D "okay"; }; =20 +&uart17 { + compatible =3D "qcom,geni-debug-uart"; + status =3D "okay"; +}; + &ufs_mem_hc { reset-gpios =3D <&tlmm 228 GPIO_ACTIVE_LOW>; =20 diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dt= s/qcom/sc8280xp-crd.dts index 551768f97729..db273face248 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -17,7 +17,7 @@ / { compatible =3D "qcom,sc8280xp-crd", "qcom,sc8280xp"; =20 aliases { - serial0 =3D &qup2_uart17; + serial0 =3D &uart17; }; =20 backlight { @@ -363,12 +363,6 @@ keyboard@68 { }; }; =20 -&qup2_uart17 { - compatible =3D "qcom,geni-debug-uart"; - - status =3D "okay"; -}; - &remoteproc_adsp { firmware-name =3D "qcom/sc8280xp/qcadsp8280.mbn"; =20 @@ -381,6 +375,12 @@ &remoteproc_nsp0 { status =3D "okay"; }; =20 +&uart17 { + compatible =3D "qcom,geni-debug-uart"; + + status =3D "okay"; +}; + &ufs_mem_hc { reset-gpios =3D <&tlmm 228 GPIO_ACTIVE_LOW>; =20 diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/q= com/sc8280xp.dtsi index 109c9d2b684d..951cb1b6fcc4 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -813,7 +813,7 @@ qup2: geniqup@8c0000 { =20 status =3D "disabled"; =20 - qup2_uart17: serial@884000 { + uart17: serial@884000 { compatible =3D "qcom,geni-uart"; reg =3D <0 0x00884000 0 0x4000>; clocks =3D <&gcc GCC_QUPV3_WRAP2_S1_CLK>; --=20 2.38.1