From patchwork Sun Oct 16 14:34:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1042337wrs; Sun, 16 Oct 2022 07:38:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM61ld3IYFeY57PrbAYWQuu3GAYFu1CwudqzcmBoSgoXVwBlhoQzFJ1AYxbPK+0DGW3HRPq2 X-Received: by 2002:a63:5958:0:b0:457:523c:57b1 with SMTP id j24-20020a635958000000b00457523c57b1mr6735396pgm.145.1665931093009; Sun, 16 Oct 2022 07:38:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931093; cv=none; d=google.com; s=arc-20160816; b=m4T1q8tQscxvqExgHLlrDot65mgg+nffdzX8cHQVRxkuaU91bxP8Ijcz0S/+MJFGxt 5kSODDNcxt6m6LNnDK5fciouqG7mX1uq338cFrMo30pMAzuLzgI08gBwDtb7SMVyfoHX QAvD43pBjO2lwlwkpXgPODhZqMF9nSpCF6SKVfp1QC57uxqFQdRy6jZx6aRf9imt1Vjq e6UGDIhUZgcr/v2igNnv7IrRseP05xpC0/AQKMHh9kB5s91fpmTXob+ufEE6HaFCdxzK wg0Ysp/rm3drIIO+K1v8/rvLgqafk9By/3gzeU1fify9f7lMzGEJ8svZlffrExhbEw/d +pHQ== 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=SqCIFBMkKHUsYImTU6oEqN9NKkHFufrsS60FGxQHQ7I=; b=hQ3h7laD8Cpcas8/iep8NQmh7zyy7Gn2pQp9Y6dSK8iJLNSDnBawab0QLhe9E2klVq /SdQ+ytWatK3UwJHF53ChgD0Nmy5t3mYbuTm7TOzDBtaHFiQqKzezE6MTT0y3yCmENVB +RR0viC/6/CWVvs+i5uGlZjvlmJ5kAp6MPaPu312VqLNLkl19wU6hkbTQpaiFE/GpGXH W0nLRMrZnxIJPS8xV+NEGjGrTrSBGC5MZt/uIPr77Vp0qTCzP6rYUvDeGEp2ewIT/+Hv +Dl5+te+VJDKj6mAoH+rrGKbwHYKN62f5UkBeFysx0CIFq1cvd2EcV8bw4v/vAN6W6bs 2dOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=VAy1RVcc; 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 n34-20020a17090a5aa500b00203917479dcsi13655315pji.107.2022.10.16.07.37.59; Sun, 16 Oct 2022 07:38:12 -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=VAy1RVcc; 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 S229892AbiJPOfV (ORCPT + 99 others); Sun, 16 Oct 2022 10:35:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbiJPOfO (ORCPT ); Sun, 16 Oct 2022 10:35:14 -0400 Received: from mail-4022.proton.ch (mail-4022.proton.ch [185.70.40.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BAE518B22; Sun, 16 Oct 2022 07:35:11 -0700 (PDT) Date: Sun, 16 Oct 2022 14:34:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930909; x=1666190109; bh=SqCIFBMkKHUsYImTU6oEqN9NKkHFufrsS60FGxQHQ7I=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=VAy1RVcc8WKGNzoCSFD2gE1r05kzQaBJq2dW1GVTsM8hnBTob1GjTlFIp5Glv2e9+ XrY6meyuVIx2Cxj8AXnZHfwhmv/jGSyPQyeYW4jBssYlaN1lf/jmW6O+Ds9UnEFWjY kQnrFpbohz7ckv38KhL/qA+pSKUgle7iaPVRmRyc= To: caleb@connolly.tech From: Caleb Connolly Cc: Dylan Van Assche , Alexander Martinz , 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 7/7] arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth firmware loading Message-ID: <20221016143300.1738550-8-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?1746855361970442820?= X-GMAIL-MSGID: =?utf-8?q?1746855361970442820?= From: Dylan Van Assche Add serial1 alias, firmware name and use 4 pin UART pinmux. Signed-off-by: Dylan Van Assche Tested-by: Alexander Martinz Signed-off-by: Caleb Connolly --- arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.38.0 diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts index 83261c9bb4f2..3e038156af4f 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -22,6 +22,7 @@ / { aliases { display0 = &framebuffer0; + serial1 = &uart6; serial0 = &uart9; }; @@ -693,9 +694,17 @@ config { &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth { compatible = "qcom,wcn3990-bt"; + /* + * This path is relative to the qca/ + * subdir under lib/firmware. + */ + firmware-name = "axolotl/crnv21.bin"; + vddio-supply = <&vreg_s4a_1p8>; vddxo-supply = <&vreg_l7a_1p8>; vddrf-supply = <&vreg_l17a_1p3>;