Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp3256849rwi; Sun, 16 Oct 2022 07:50:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4lk9HatOST3cuUrjsjYQ07IK94a2RlM8IE80JJM1ONsLKYI/fMx75e576GmUC/x9HULPG7 X-Received: by 2002:a17:902:8309:b0:17a:695:b5bf with SMTP id bd9-20020a170902830900b0017a0695b5bfmr7140491plb.35.1665931821110; Sun, 16 Oct 2022 07:50:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931821; cv=none; d=google.com; s=arc-20160816; b=dBzL2pXhF9ohD7nYEeakhq9sZfNuRkC9JtxPSHagceboCDQVIHsyfaZk+8sDGbG1N6 hrJzLMuRnMu5vTFBciBBjX67uZrmI6ml998xV96buljy1OkC8M1r48Ioaerj4YYImrIm 6SOavJUdXKqVkLn3U2ZuaZa7uA+UkAFpKB6sokDgTWgAohCR3/kna+ULPwgF+5i8W7TY f5fLopEY/SpDxhQXJ5mpW7VybX7eh2DSIpKEAoCJn3s6y1fLPjnZC7sz804hv9RoSzDb dDitsdbGmgqh8RFcEKRoePec/oYo6AkTrnl29/iXJbHcXMz0NGGMArLfelm1nhyZ3I77 onMg== 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=UApboHemUHszoyIAoKTwREf/Yubwe9WI5bTVBqfQa30=; b=aFRV+YlBR1yXsaDk6nTQybaLJD5SieYBMlPcLRYIiT03LkheaOyCQmF+OAnXEikItH bmThKu2+L0TKVl2QcEmIfMjdFFMv5oUY5rTHa7Cha8KkhPJeBDh3Od0yzEXs/MNthyts kVuNwogjXiFXVH5Wf1B5ygHax7yJ9bM4L99trcPF3Tdli8b66LwBw4ymv7NDi8k1gwZN rak/sDoBRg1F8XinNY7SJyn6bvbgqloUtacn3HHp+56GQrHTsM8HMUbEdn/WolE2/qh3 KrtZcj3csosM0LBc51cAPdshKN+Xjjv7snQnjVSrHb1fQX41WJjxuuuuDfU3LwY7Y3ve vE9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=nrPJUZg0; 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 j9-20020a170903024900b001769b63ec65si9542874plh.483.2022.10.16.07.50.09; Sun, 16 Oct 2022 07:50:21 -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=nrPJUZg0; 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 S229882AbiJPOsa (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229757AbiJPOsT (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 1E4463AB14; Sun, 16 Oct 2022 07:48:11 -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 4E81C1402CB; Sun, 16 Oct 2022 14:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931690; 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=UApboHemUHszoyIAoKTwREf/Yubwe9WI5bTVBqfQa30=; b=nrPJUZg0GvwY1qmjR9N8hll3rBRFMD/MpsH/3KKRHQmXPHcd+YYTcFn1Gq0x+kaL7FlU9J VivlB/epw4tCVCk/pkZcyzViWF7IskEAL9Tp/t7nZXHpjA3dNwMrRvoVd/sMeuy7Uq9y4Y iqBUJqNpNM45lRrhK0oOYll+m+mRqGk= 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 6/7] arm64: dts: qcom: sdm845-xiaomi-polaris: commonize uart6 pinconf Date: Sun, 16 Oct 2022 15:47:12 +0100 Message-Id: <20221016144714.1742824-7-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-polaris.dts | 27 ++----------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 7747081b9887..c8b439dcbca4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -639,6 +639,8 @@ wcd_intr_default: wcd-intr-default { &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth { compatible = "qcom,wcn3990-bt"; @@ -735,28 +737,3 @@ &wifi { qcom,snoc-host-cap-skip-quirk; status = "okay"; }; - -/* 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