From patchwork Sun Oct 16 14:34:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3026 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1042060wrs; Sun, 16 Oct 2022 07:37:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7u/JVBJp4qoQtZfUGvVCXTRIBzmbNrQGpw3+qS8jz1+40URgSijMyYHtzAdvU+oQ/PJrf1 X-Received: by 2002:a17:90a:d3cb:b0:20d:92d6:a047 with SMTP id d11-20020a17090ad3cb00b0020d92d6a047mr25682433pjw.155.1665931046729; Sun, 16 Oct 2022 07:37:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931046; cv=none; d=google.com; s=arc-20160816; b=lrXTxCXrJTotTlEEAjfz8OCrr76Sg6IFPFr9Kwb8zJcL3vg/jmr4aY2lKFQ0hw+RNV tdClkk1XU2HvckmStySaQG830LfsTpZhYs2MpjYviQhUyfBdMmmBcnWatwv3HB/YfCcj bSyVhaiyHnTKes8XfdNWca+4y5iSPHjY8eWnpKNRqHaNuvnqCDNsoNL92qZn/n5uRTaW u4VjVJh3dl4QpVwFUh/8JwXJ3tTl6vAWddlqP4V419DNAmPv3+0L51rrBELK+p4UaJER nI6nhZ22jbylFBk6LoW8hLUYDVY8n1MN5OjD3JsYeUpRY7s1zx7RV6KiqCp5Ey3dZjUD kz/Q== 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 :feedback-id:message-id:subject:cc:from:to:dkim-signature:date; bh=fOCEUqTzrXFvKLyulfGNIl6TWBAPrPGAVzA0GPmNZp4=; b=jZexVacXtX1SnVDOq8lvIUvxQFV2pbP+N6kH17vDH0PPA5gTuUi2OLmwDgGW4CqKFm HgMHQtSEfPAIlNcGVWfTktBt+j86qJyWpgyrHBhNTg2gU6dbwpMNGmZxG1tpsAobJ9WU RsqRBFCuvBu1HrXO9sWDMMT+YZr2ioOPbfDQjU3O0nVw/GSn5PovzC61dP3LZs38mXlF RS4LUPlSrn3+tDWepUmogoR68DfxQGW6gIsP+a+hcrnUXb/pOVEgObCl2Vx0P/05NU1p CzrhCBjcChdK9ByI4IIhhA946PhlxTy31FJKrXZMC6kf5PuD+cH/BsQ0DCJQITzKBml3 8Z/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=jvg2Afnb; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oa2-20020a17090b1bc200b001fad0e954cesi9974958pjb.32.2022.10.16.07.37.13; Sun, 16 Oct 2022 07:37:26 -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=@connolly.tech header.s=protonmail header.b=jvg2Afnb; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229824AbiJPOei (ORCPT + 99 others); Sun, 16 Oct 2022 10:34:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbiJPOea (ORCPT ); Sun, 16 Oct 2022 10:34:30 -0400 Received: from mail-4323.proton.ch (mail-4323.proton.ch [185.70.43.23]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EDE62BD5; Sun, 16 Oct 2022 07:34:27 -0700 (PDT) Date: Sun, 16 Oct 2022 14:34:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930865; x=1666190065; bh=fOCEUqTzrXFvKLyulfGNIl6TWBAPrPGAVzA0GPmNZp4=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=jvg2Afnb7lNXtSHQRAvsjLjjFCSTWNbEuyL9FsM/iSEvhQgRG31i23j1NcHavuRXx tewtThbEftr3ReSjgGcjyge9WgswjI7hGMjIXESXZ3Dft2gNr1/MEHA5aolAEl2EOY V/y9uofWx5+XqQVsGojPP3ryaF9elOSPxN7jB/Vw= To: caleb@connolly.tech From: Caleb Connolly 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: [PATCH 4/7] arm64: dts: qcom: sdm845-oneplus-common: commonize uart6 pinconf Message-ID: <20221016143300.1738550-5-caleb@connolly.tech> Feedback-ID: 10753939:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,TO_EQ_FM_DIRECT_MX autolearn=no 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746855313059505504?= X-GMAIL-MSGID: =?utf-8?q?1746855313059505504?= Use the new qup_uart6_4pin configuration in sd845.dtsi and fix alias name. Signed-off-by: Caleb Connolly --- .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) -- 2.38.0 diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi index 392461c29e76..5d99908d4628 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -19,7 +19,7 @@ / { aliases { serial0 = &uart9; - hsuart0 = &uart6; + serial1 = &uart6; }; chosen { @@ -500,35 +500,11 @@ pinconf-rx { }; }; -/* - * Prevent garbage data on bluetooth UART lines - */ -&qup_uart6_default { - pinmux { - pins = "gpio45", "gpio46", "gpio47", "gpio48"; - function = "qup6"; - }; - - cts { - pins = "gpio45"; - bias-pull-down; - }; - - rts-tx { - pins = "gpio46", "gpio47"; - drive-strength = <2>; - bias-disable; - }; - - rx { - pins = "gpio48"; - bias-pull-up; - }; -}; - &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth { compatible = "qcom,wcn3990-bt";