From patchwork Sun Oct 16 14:34:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1041930wrs; Sun, 16 Oct 2022 07:37:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5yTk19jyYmPzvOeP9pwplVlmm2hPOyFT6iGjwd2V/MyRkHfZAVWMaZ3Fqu5kVRCGGXqP+f X-Received: by 2002:a17:902:7e0e:b0:17f:8edd:5f00 with SMTP id b14-20020a1709027e0e00b0017f8edd5f00mr7432750plm.96.1665931034932; Sun, 16 Oct 2022 07:37:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931034; cv=none; d=google.com; s=arc-20160816; b=ASHGgW/zWEX9HgLxiYs47wb1ZO9nGlkIy4lgXjpEtGjM3PiT15UTT9FvJ+iW9phrkz qd06Iiv7GgjpW1s0qxuvHQOTLaF0Tg3Rl1r0YfL+PG3Sv2X3HL2eMXsqrifPJyB7L1Yq AiCtj3Agy5mB9V+qLaBZUMv4y907+jgwQ8WE0/C+qIfQC0h41ol8/qPX3XB2gR8J1o78 15qnI9hBYnjhteamdN2P6tVfxN0PwIHdfFwQ8WHm6CGwWQu+aB5+gURvK3XVy1jotGCy HmGa5L4JPJ7VeUVpmBS3ObBfkozqPPxOGBegUyagyXsfuu+HQCXURqHMrj4f02kaFenq USsw== 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=CSTPfSj1OAUNfmI5pgjMNDJRewudlbE5XQ/hVQybyc0=; b=jLoenh0OqTJ+uaFXWUufFvJd4OjPHZcq8i3EubsFArXAoSYRkbjk1mhiMWnV6fnjXR 7TGYT+GpPM5EM1iM8mwmyUwXvfSawzpEG42HI5zdTz6oceGWY0uLDwS9egLuGxR4Sl03 6f6qgT8dznFW0iLWwRWXuWazAiwZlSysWSVErg76coFOkpFj4lPTSEjOOOfzwAhzx67n 8A+4AJHtvEyQXcHbOEP+rkKQupROapWJSF3N/gpPmzqlz0eWplIysK2akNwLE3N6VNHK 3Dx9twYokTl4Lor1b1ESky+P72ZTzP6pWLlPrXGJfoMAIEW/4oB7UYD0Bk3mq2t8cS9V 5JYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=GvfDqmP5; 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 i23-20020a63e917000000b00434cc1d3b6asi8863531pgh.68.2022.10.16.07.36.58; Sun, 16 Oct 2022 07:37:14 -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=GvfDqmP5; 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 S229819AbiJPOeR (ORCPT + 99 others); Sun, 16 Oct 2022 10:34:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229818AbiJPOeO (ORCPT ); Sun, 16 Oct 2022 10:34:14 -0400 Received: from mail-4022.proton.ch (mail-4022.proton.ch [185.70.40.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B474C32BB2 for ; Sun, 16 Oct 2022 07:34:12 -0700 (PDT) Date: Sun, 16 Oct 2022 14:34:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930850; x=1666190050; bh=CSTPfSj1OAUNfmI5pgjMNDJRewudlbE5XQ/hVQybyc0=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=GvfDqmP5ZzxRR7A9e7jN/c+CchAGpc10ZgcJuaXB+IE9JF0yJULVo0tX/9dyjgBxO BGRpydEsAotkOIMqlNOraNEMAkA2f1zCZTQBaKNIO4k6HHdoh4ASHYtqvuV+WDpsAL zd2zNAbRqt0obUh7MSg6sLAruz+0aEiIcH+fDxhM= 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 3/7] arm64: dts: qcom: sdm845-db845c: commonize uart6 pinconf Message-ID: <20221016143300.1738550-4-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,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?1746855300926636841?= X-GMAIL-MSGID: =?utf-8?q?1746855300926636841?= Use the new qup_uart6_4pin configuration in sd845.dtsi and fix alias name. Signed-off-by: Caleb Connolly --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 27 +++------------------- 1 file changed, 3 insertions(+), 24 deletions(-) -- 2.38.0 diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index c6e2c571b452..215dd8098a44 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -22,7 +22,7 @@ / { aliases { serial0 = &uart9; - hsuart0 = &uart6; + serial1 = &uart6; }; chosen { @@ -986,6 +986,8 @@ &uart3 { &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth { compatible = "qcom,wcn3990-bt"; @@ -1141,29 +1143,6 @@ pinconf { }; }; -&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; - }; -}; - &qup_uart9_default { pinconf-tx { pins = "gpio4";