Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp3256218rwi; Sun, 16 Oct 2022 07:49:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7NFuzsvouuFsqrI3zdsLGS5WtfQ2WtofXKiqcOq18pyCopGyeMQvEomMFE1p6XnTTlnxBk X-Received: by 2002:a17:90b:4acf:b0:20d:673e:7b1 with SMTP id mh15-20020a17090b4acf00b0020d673e07b1mr8875132pjb.204.1665931781451; Sun, 16 Oct 2022 07:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931781; cv=none; d=google.com; s=arc-20160816; b=S73PDqO6mssAjEPAWTJy7HkyjyKmuztnxEzzX9gS+Z7yTV6nGsvlKRhw+W1PlHcB5P BGAqanopwyLWejPDhnGV/OQNpvOU3AqSN4dVsEkKJLlSoeYfweh32QK5F+42brhQtkGG ye77p7M6ub0JTsrySdivmZcZa73TSzkcboI2GYDqT0lYVji7+4L/DMFKqEfO/JQQ8o6W xE7zihGZAwE7HjbpdbmPAqTqRvYMatGYczscb3OXZY0jSo/XKSq/EJ8qcPe5b/pNCh3c Ln2IQ3iHqGJ+dc92gruJHGOkZMrcNCvjm/3GEVH13o5QJSBFk/MpblG9FplefXB3fia1 n6EQ== 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=JMybwLMLlth99DWUE9yhG7qXyR2N9mR/hTWgjCOFWs8=; b=wWahsQqW4NtF/jBFPImMtUKqe05XXx9WZuxckLEtkbl9uCVN/iJU368Lbjarlcz6la Te0JtyLXrIqt0EG3q0LV0+tdNG/QtriYuLV+Mv+2Qpf/WOTjBmjyi6CiQQTX5Sy1I4vP HYkQ12iH1ofz8+u8wRU18fbzAEzeKlLvTdB07H0t+A+CWR9z2nJkYStEWZHWlVMergHl GzbmjQYSr94VrM5nmEnOJXYrtAfkqaCTYbq3+Rzme6zMRbHjnIJ2HPLZG/CS9Vv62Cgk RGLfPXUikQEd5d0uAmeqhbnK5he9WIZ0ANZbPtWGGp8VCW+V8yeeeL9qX+xJMlIkWaqX 4amA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=JnBz7UeT; 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 r5-20020a63ce45000000b00451b094d74bsi8007391pgi.454.2022.10.16.07.49.29; Sun, 16 Oct 2022 07:49:41 -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=JnBz7UeT; 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 S229831AbiJPOsV (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229800AbiJPOsS (ORCPT ); Sun, 16 Oct 2022 10:48:18 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3DE573C16C; 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 49D501402C9; Sun, 16 Oct 2022 14:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931687; 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=JMybwLMLlth99DWUE9yhG7qXyR2N9mR/hTWgjCOFWs8=; b=JnBz7UeTi8gPDABOMDauz6tUGd/qh5znUefQbgu+jLN2NRpPdP1EgEQhQBLhBpYVF3qTGP t8VG7PbR6z+phr8HrzXvIuScNAwNBE2GuRBhrAmewJbvB79Wu+lLqUDed8Y3ar47giiXdw PYGXm2bXybytVfmouYlVDpVuCddggm8= 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 4/7] arm64: dts: qcom: sdm845-oneplus-common: commonize uart6 pinconf Date: Sun, 16 Oct 2022 15:47:10 +0100 Message-Id: <20221016144714.1742824-5-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-oneplus-common.dtsi | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) 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"; -- 2.38.0