From patchwork Sun Oct 16 14:34:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 615555 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 179E3C433FE for ; Sun, 16 Oct 2022 14:34:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229594AbiJPOey (ORCPT ); Sun, 16 Oct 2022 10:34:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbiJPOel (ORCPT ); Sun, 16 Oct 2022 10:34:41 -0400 Received: from mail-40136.proton.ch (mail-40136.proton.ch [185.70.40.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40E2B1004C for ; Sun, 16 Oct 2022 07:34:35 -0700 (PDT) Date: Sun, 16 Oct 2022 14:34:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930873; x=1666190073; bh=ZseDGcoe4OIAaVlHQjhD3IczOM2W29Cg0YZOAMrNt2U=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=W9mEDBfEZuZtawNU2vQRfl78qSxztHlrNuh73JhAiAGuVgkO32Gzo75mZaYa7eFl4 sfFff9PGi20DvfchCUgmR09LGOj4Y3kfWAq6J+lkx5ffwByANq2KW+mhRoC7bA2MO8 OOSHpa3P0hbPHtE3k3uBtZh5C+MDC3zbSeifSvjQ= 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 5/7] arm64: dts: qcom: sdm845-xiaomi-beryllium: commonize uart6 pinconf Message-ID: <20221016143300.1738550-6-caleb@connolly.tech> Feedback-ID: 10753939:user:proton MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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(-) -- 2.38.0 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; - }; -};