From mboxrd@z Thu Jan 1 00:00:00 1970 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 EACB0CCA473 for ; Wed, 6 Jul 2022 18:49:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230472AbiGFSt4 (ORCPT ); Wed, 6 Jul 2022 14:49:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234525AbiGFStz (ORCPT ); Wed, 6 Jul 2022 14:49:55 -0400 Received: from mail-0301.mail-europe.com (mail-0301.mail-europe.com [188.165.51.139]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 419DF275E9; Wed, 6 Jul 2022 11:49:54 -0700 (PDT) Date: Wed, 06 Jul 2022 18:49:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1657133389; x=1657392589; bh=FQD+MMDt/Q8SRTTAfcqxo1U1VL4S1CdzwRULBkrzEs8=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=SSodwAqUa6IEewyZfhwUlzSIwB7mAi7o0Tc/QGeKhXjB2Akhlw2pRuB12+A7pixy6 xAsI5FDQK8WDXRaYkjfeSR3yyijiP9MY2yLgnEhiWWhoj9weJp+KZo9YZyShXlQPnC B5DsoTiTV825+tQlgOXwfaaM+pjvSniQUo6uyQZo= To: Dmitry Baryshkov , Alexander Martinz From: Caleb Connolly Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Dylan Van Assche Reply-To: Caleb Connolly Subject: Re: [PATCH 1/2] arch: arm64: qcom: sdm845-shift-axolotl: fix Bluetooth firmware loading Message-ID: <0488a37f-083c-6e8c-eff2-e204b242cbfb@connolly.tech> In-Reply-To: References: <20220609095412.211060-1-amartinz@shiftphones.com> Feedback-ID: 10753939:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 09/06/2022 13:47, Dmitry Baryshkov wrote: > On Thu, 9 Jun 2022 at 12:54, Alexander Martinz = wrote: >> >> From: Dylan Van Assche >> >> Add hsuart0 alias, firmware name and prevent garbage data on Bluetooth U= ART lines > > hsuart aliases are not standard. Please use serialN alias instead. > >> on the SHIFT 6mq based on the Qualcomm SDM845 chip. >> I discovered that these were missing by comparing the DTS with similar >> devices such as the Oneplus 6/6T and Dragonboard 845c. >> >> Signed-of-by: Dylan Van Assche >> Tested-by: Alexander Martinz >> --- >> .../boot/dts/qcom/sdm845-shift-axolotl.dts | 33 +++++++++++++++++++ >> 1 file changed, 33 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/ar= m64/boot/dts/qcom/sdm845-shift-axolotl.dts >> index 103cc40816fd..fa72f23ef0c2 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >> @@ -20,6 +20,7 @@ / { >> >> aliases { >> display0 =3D &framebuffer0; >> + hsuart0 =3D &uart6; >> serial0 =3D &uart9; >> }; >> >> @@ -529,6 +530,32 @@ volume_down_resin: resin { >> }; >> }; >> >> +/* >> + * Prevent garbage data on bluetooth UART lines >> + */ >> +&qup_uart6_default { >> + pinmux { >> + pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; >> + function =3D "qup6"; >> + }; > > This chunk should probably go into sdm845.dtsi. I'd suggest either > adding a separate qup_uart6_4pin or just making qup_uart6_default the > 4-pin UART. This sounds good > >> + >> + cts { >> + pins =3D "gpio45"; > > Then the label and 'pins' can go into the dtsi, while keeping just the > bias and drive-strength in the platform dtsi. > >> + bias-pull-down; >> + }; >> + >> + rts-tx { >> + pins =3D "gpio46", "gpio47"; >> + drive-strength =3D <2>; >> + bias-disable; >> + }; >> + >> + rx { >> + pins =3D "gpio48"; >> + bias-pull-up; >> + }; >> +}; >> + >> &qup_uart9_default { >> pinconf-rx { >> pins =3D "gpio5"; >> @@ -667,6 +694,12 @@ &uart6 { >> bluetooth { >> compatible =3D "qcom,wcn3990-bt"; >> >> + /* >> + * This path is relative to the qca/ >> + * subdir under lib/firmware. >> + */ >> + firmware-name =3D "axolotl/crnv21.bin"; > > Do you know what is the difference between axolotl's bin and the regular = one? Just checked in a hex editor and there are some differences. This firmware = is signed on most devices but given the SHIFT6mq is secureboot off we could in theory use upstream firmware here - if it works. This particular device has= some very broken wifi firmware - we have to use the firmware from the OnePlus 6 = to get wifi to work at all... > >> + >> vddio-supply =3D <&vreg_s4a_1p8>; >> vddxo-supply =3D <&vreg_l7a_1p8>; >> vddrf-supply =3D <&vreg_l17a_1p3>; > > -- > With best wishes > Dmitry -- Kind Regards, Caleb