Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp3256713rwi; Sun, 16 Oct 2022 07:50:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6FG5XxPv/KsMCU5Icp1NWpx/9kEYAGEokBDg3VrcY5si2bYPOHmsPxwo4s6XRYAOZRu7XO X-Received: by 2002:a63:6f8a:0:b0:439:36bc:89f9 with SMTP id k132-20020a636f8a000000b0043936bc89f9mr6706198pgc.100.1665931811712; Sun, 16 Oct 2022 07:50:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931811; cv=none; d=google.com; s=arc-20160816; b=bgJ3+UULVLaynK14YaGnsm0SDEt2u067lBj0UxzLvSv5FkMWlVM96X0Ao4+CYxhpCl 5tnUB5j+3fdhLm7JQcN67/2kLpGrvbOclpCRo6GxNc+N1kWTJnOBKSX5k5TgDk9Js8Gf CXXqbs2Xm16yGCDWGyUF6PCB9jsKzj9hUGAPTEfdu2kvbC7zXrbxQlSJ0mTuU5SowYIW fTgPl0cDWeuehlD3nH5rQS52wFu1U+yKDYutr67dEtNuI+d6b1DeMoukAw4GztWJt4iP iUI/+dA6Xr74ZUpysQtSIdM8N8Ogmj95DxT0fEGotAaav9udPLfiyLvh8lQLVtW2nEdO GlZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=v4Dcgfs7tb87jF5kiMXTGRJf9D6ZKn+2WZ6hnvK634Q=; b=UYloJ47UzUR9+yNGzmSsPLWMNyPnQbKzWgUtlqgImbksVSjLn9EOZjxFAUDnXP2W2R 8OYXyARbWIcaJkHDmqB4egsaA1ztGcHUPV0FwxXVRT0Gdtdc9KpFNIQjbF4AyAGZNj4R 9wkk6Z0vmosxgkCylMcs+l9G6432VG7EHhTNDR0gorPF8gJxotNX7cYxCBY373KTf8Z2 c+0QHHQ+EZczdlGZxWEna5pf/NWxLrjsaCOarvoMUpXSD8HBnpDCeMm3sgCTGYaIJ+br 0A5lDF2lrmRyVadASwBT4kP9TKeZ4X2oB8cwPUOuxnVvd4fAa7v7ftsfAAXZx6PaRgO1 yIMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=IzlnLThD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c4-20020a633504000000b0044a0b2e174asi9423397pga.83.2022.10.16.07.49.59; Sun, 16 Oct 2022 07:50:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=IzlnLThD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229830AbiJPOsZ (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229802AbiJPOsT (ORCPT ); Sun, 16 Oct 2022 10:48:19 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7A2723C8C0; Sun, 16 Oct 2022 07:48:09 -0700 (PDT) Received: from localhost.localdomain (cpc76482-cwma10-2-0-cust629.7-3.cable.virginm.net [86.14.22.118]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by proxmox1.postmarketos.org (Postfix) with ESMTPSA id BA3871402CA; Sun, 16 Oct 2022 14:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v4Dcgfs7tb87jF5kiMXTGRJf9D6ZKn+2WZ6hnvK634Q=; b=IzlnLThDTaT2YKIbc8mEhq8RzqbUFtlOXUAgaZTco5Xj2hsFOY2skV89+2FNVlH3+L8tNc YEBnOvOZRnKBu1Qcbb7b7Q6XThYYKHN6sf06X0fTIwQfJCm5zpOa/YucO2FjUfWJu8wQdq rvZxJmEYjYNeAJeVWXVgYjleQRqZ3Do= From: Caleb Connolly To: caleb@connolly.tech Cc: Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, Konrad Dybcio , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring Subject: [RESEND PATCH 5/7] arm64: dts: qcom: sdm845-xiaomi-beryllium: commonize uart6 pinconf Date: Sun, 16 Oct 2022 15:47:11 +0100 Message-Id: <20221016144714.1742824-6-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016144714.1742824-1-kc@postmarketos.org> References: <20221016144714.1742824-1-kc@postmarketos.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Caleb Connolly Use the new qup_uart6_4pin configuration in sd845.dtsi and fix alias name. Signed-off-by: Caleb Connolly --- .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts index 82c27f90d300..1646db2328d4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts @@ -35,7 +35,7 @@ / { qcom,msm-id = <321 0x20001>; aliases { - hsuart0 = &uart6; + serial1 = &uart6; }; gpio-keys { @@ -481,6 +481,8 @@ wcd_intr_default: wcd_intr_default { &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth { compatible = "qcom,wcn3990-bt"; @@ -567,28 +569,3 @@ &wifi { vdd-3.3-ch0-supply = <&vreg_l25a_3p3>; vdd-3.3-ch1-supply = <&vreg_l23a_3p3>; }; - -/* PINCTRL - additions to nodes defined in sdm845.dtsi */ - -&qup_uart6_default { - pinmux { - pins = "gpio45", "gpio46", "gpio47", "gpio48"; - function = "qup6"; - }; - - cts { - pins = "gpio45"; - bias-disable; - }; - - rts-tx { - pins = "gpio46", "gpio47"; - drive-strength = <2>; - bias-disable; - }; - - rx { - pins = "gpio48"; - bias-pull-up; - }; -}; -- 2.38.0