From patchwork Sun Oct 16 14:47:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1046851wrs; Sun, 16 Oct 2022 07:50:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6e4okdhQfiaC7VdI2LpzQQV2Gy8226WoBpaqi9nOepEynefu3d5QN8lRUwxlvg0W5wJC0y X-Received: by 2002:a17:902:f806:b0:184:4a8c:f91f with SMTP id ix6-20020a170902f80600b001844a8cf91fmr7411784plb.45.1665931820056; Sun, 16 Oct 2022 07:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931820; cv=none; d=google.com; s=arc-20160816; b=gReJSHRHSElsECXDfkAsV+w7xXauv5x9mh3tBMdF3bUJdI/9hKy0/+ggFjo469jmFX BD5IAmyfbi/Hd7HLbtZwHGV265qkffgv4kgLQ7QkJ4ehDSb/vfXUVNt6D4DV1SnRDkwF cKz/yQgLA5Xj7HyW/uYbj4qOl9YJyLrJOT0andVEhwIvkXrOFy9sZXie4RgOp80C/yn/ teNYuQjQEKOFsXyXVu2Af1uINk1iEytBNmpiCudQ7VEOi+D+1mFcT1Ua+tPgZGY2x98K gMJZdOKtrPwX7/485BRVDLiwhdF8pZ3QmprJRnqxA2gG6RKIH4H8NxzhHoj3biyyHscQ u3yA== 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=VEjDpMV9FqHd8EpFEvxdteRzPjno13eoyZu2+rp7hAQ=; b=WBcE9eM6pCEzHn2bTewUdl3Es1CJNJkkB/4U3r2oa35ecvWZLVr/smGP+Z1Bc8gVVG ObjnORVwmuJIzjgLwbbFjk56PWDDJhxnXSBoVtrZScOMn9yzWjCV5M0BQTDCuPRJi+/l jyxCKZ1gpWBgFnRP771xtQXyb+yrzIw5D1/xWxFGemxkp0xJZp62qPgJsrl1ug6UexLN nzZMjBr/iNUxNrd3MOwyFSeBvHhvnKuoL4/+H9qDG4X6sCeEANENStUkKnpSAj8987XE HGTp5NGS9VcvfrAfR5n47C3F+DCDp68LuSM55IgXdpDzkE6Xj9nCl0A866lUPjVaTfK/ kTcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=XRdXyhrB; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p4-20020a637f44000000b0046b3dce8455si410740pgn.14.2022.10.16.07.50.08; Sun, 16 Oct 2022 07:50:20 -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=XRdXyhrB; 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 S229751AbiJPOsh (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229727AbiJPOsU (ORCPT ); Sun, 16 Oct 2022 10:48:20 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BA0703CBFE; Sun, 16 Oct 2022 07:48:13 -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 BCB931402CC; Sun, 16 Oct 2022 14:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931692; 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=VEjDpMV9FqHd8EpFEvxdteRzPjno13eoyZu2+rp7hAQ=; b=XRdXyhrBCtVZeIVfJIWcgZZ6hpAAbgjk535vCf0OIFfot9Atyx+AxXABpoCFTmDmSSq9NE JiURUz+kbvtYt/pctVyB9QMhT2CPJkRYy7KMM7iCSMNDaG5ZzsU0fXEx611500yx6lX0ru lg1Ini4ra/J+VlaL7/kkF+Bp859Rnxk= From: Caleb Connolly To: caleb@connolly.tech 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: [RESEND PATCH 7/7] arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth firmware loading Date: Sun, 16 Oct 2022 15:47:13 +0100 Message-Id: <20221016144714.1742824-8-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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746856124353579512?= X-GMAIL-MSGID: =?utf-8?q?1746856124353579512?= 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(+) 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>;