From patchwork Fri Apr 21 14:11:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 86340 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1100703vqo; Fri, 21 Apr 2023 07:15:20 -0700 (PDT) X-Google-Smtp-Source: AKy350Y0W7gK+FoPm/Lf4FO2dX//6Ye0AV01yCQalRFqeBVrQxPg2OtSZmXQpHNwjsWEpbl5wI5n X-Received: by 2002:a17:90b:19d5:b0:246:bb31:e848 with SMTP id nm21-20020a17090b19d500b00246bb31e848mr5022753pjb.36.1682086519805; Fri, 21 Apr 2023 07:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682086519; cv=none; d=google.com; s=arc-20160816; b=dqWHPemPaSwpq2bRmr1C7ut9MOvEGeIhZPe5mxJLTpmPqlLJ5v0VYgGC2tQBvLMhvB OEKfAHZVJNjjjNoaNgseYOWnkYLFQVh1jXm1Gq2dxGfb02M6MvCN6HzAtAbz7ua3SVlM sJTISwF8gnGD8PpXCe2yu4Rnm6mnBgvIdja1rr+2HqaVHor3+wnNZ7duvWcqTGDdJS6c Gyzbb94UCSajXQDNvKQYlzUOHRGV3UfnBNSneTPPnIUJDW+PO9jiK51amDOwC94T9LiZ n4hGCwyYYZOnIBLatyj61xtRW8ng5MJt+vSh4S3K+8vEjviHGMUzn5bSQgCR9AaTD6nh JsZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=cSsyRwQja94Kgy9jcokEVnB8iKeKI+at5CFxMQlo/L4=; b=qXS+gjhtqxwiMIHUhnmUIH5hJxg4QJoU2d9UJoK4gmwfbf0TWwTHaMBuow7lDstEHp bRB5aDknFeqSmf6Ljt6ZWlxdohC1DgU5iTLZffXMceuSHIBP4nPDG8xz3ag7JFVMWVlt KR6njgVvbt/b9BNjryzJGuRvwQgl6CKIGwLbyE/Umjglvr7eheb/6wSeAxogrg//jwf3 Wz4+2WjntTKUosSFPWvqKPykAOirs677qUbwhD/ZmE7aVWLe6A28fsSSQxWFkRXof9Q5 +TKkF6UFzCYGeHYYFR8aN3hY8ToVaOFZJM84gKWpdaziI4lfc/3Emn0BQTw0LmhiyDm6 OKqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=q8qy3Foq; 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=fairphone.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id le8-20020a170902fb0800b001a1ddcfeba2si4326238plb.492.2023.04.21.07.15.06; Fri, 21 Apr 2023 07:15:19 -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=@fairphone.com header.s=fair header.b=q8qy3Foq; 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=fairphone.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231728AbjDUOME (ORCPT + 99 others); Fri, 21 Apr 2023 10:12:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232496AbjDUOLu (ORCPT ); Fri, 21 Apr 2023 10:11:50 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BE3B1259A for ; Fri, 21 Apr 2023 07:11:44 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-504efe702d5so2479210a12.3 for ; Fri, 21 Apr 2023 07:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1682086303; x=1684678303; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=cSsyRwQja94Kgy9jcokEVnB8iKeKI+at5CFxMQlo/L4=; b=q8qy3FoqPSsA/RN+2+v5yIedAWtpj7AHuYl+bfkx9lZ3zHQfQhRt0daG4luOvxgRfy 4DY8MX9eq1AWSCdNNd9yN/3UFmvFpY9xooTIv2VGgdBR2mK6ezVaKCJ+DO6rgcz41RLT bRRrmwQGZP6pN/uJu6lpqDCrHGG6y6Qw9o34AK632nyOXegPO3NAGdwzEaXr4PC3YJDF d1Y4GrutiNWZpYpVNo3twFD61FLCYM08BpaRAYy4ZJK9V4CsMvLjnYyqCaxX+0AIPGzW uT6fh/mQrLgAnO52CZfMAOK1zTkT3OdmL1pFAV7bIACDkh1t8GL4u1VgylhvCc2dCRqt esdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682086303; x=1684678303; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cSsyRwQja94Kgy9jcokEVnB8iKeKI+at5CFxMQlo/L4=; b=R00o09t5OjoF4ibBe9hjERKHdxLvkGnpVO2BuiwyEgxk7kRbHvHX7KPZJh775dpkLG q503g3KRfk2ZHnCqLqmd3b2PrSOFE1ZWNsseGL596IA+HRRkKeg5wLbvJ0lVmQEZFnw0 5X7TTvEl+V86tf7hz2kTxGmDlnhDm97lGM0CCaWWTmuypRt+fP6jt6+4Dkw2LdMtPnG0 1eAEkXpPnsg/18WmZt2DdthrH/pyfkE0CUE1Ih1IbctxMZrwTrfH4XSmRYlQbeYRebOG K10sVsMNwlh13U6YncucKmWyW2TxucmE6YtsgJRdorLmhHShYqhI6nJdNCcVkIx3tcjU 25EQ== X-Gm-Message-State: AAQBX9cXxBJ24SZz1Fgqbfm4VCH/tVyf10NZRfYMXesmNzlctdXPgxLM xE2NadlIvFrf2Li0o3UpRP8DRA== X-Received: by 2002:a17:907:874b:b0:94f:2a13:4df8 with SMTP id qo11-20020a170907874b00b0094f2a134df8mr2734432ejc.36.1682086302723; Fri, 21 Apr 2023 07:11:42 -0700 (PDT) Received: from [172.16.220.31] (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id mb20-20020a170906eb1400b0094f432f2429sm2104299ejb.109.2023.04.21.07.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 07:11:42 -0700 (PDT) From: Luca Weiss Date: Fri, 21 Apr 2023 16:11:38 +0200 Subject: [PATCH RFC 1/4] dt-bindings: net: qualcomm: Add WCN3988 MIME-Version: 1.0 Message-Id: <20230421-fp4-bluetooth-v1-1-0430e3a7e0a2@fairphone.com> References: <20230421-fp4-bluetooth-v1-0-0430e3a7e0a2@fairphone.com> In-Reply-To: <20230421-fp4-bluetooth-v1-0-0430e3a7e0a2@fairphone.com> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Balakrishna Godavarthi , Rocky Liao , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Andy Gross , Bjorn Andersson , Konrad Dybcio Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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?1763795554410807205?= X-GMAIL-MSGID: =?utf-8?q?1763795554410807205?= Add the compatible for the Bluetooth part of the Qualcomm WCN3988 chipset. Signed-off-by: Luca Weiss Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml index 68f78b90d23a..7a53e05ae50d 100644 --- a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml +++ b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml @@ -18,6 +18,7 @@ properties: enum: - qcom,qca6174-bt - qcom,qca9377-bt + - qcom,wcn3988-bt - qcom,wcn3990-bt - qcom,wcn3991-bt - qcom,wcn3998-bt @@ -106,6 +107,7 @@ allOf: compatible: contains: enum: + - qcom,wcn3988-bt - qcom,wcn3990-bt - qcom,wcn3991-bt - qcom,wcn3998-bt From patchwork Fri Apr 21 14:11:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 86341 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1103248vqo; Fri, 21 Apr 2023 07:18:28 -0700 (PDT) X-Google-Smtp-Source: AKy350bo0nOfk+qo6H7BEDCI0hb4a8cGHkrRZscCVR+xXTTFwlasBB/5VQ2phf/Qfy9WME/QyHW5 X-Received: by 2002:a17:903:189:b0:1a6:4c34:98bb with SMTP id z9-20020a170903018900b001a64c3498bbmr5385180plg.57.1682086707929; Fri, 21 Apr 2023 07:18:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682086707; cv=none; d=google.com; s=arc-20160816; b=kj+rySYC2H/u/YTo/FT0Z8NRB2KQPu+k8ITziSN86ptMRNWtEwR4iga0rwNqACx2az X1vz3zTVWOBV0gKoD7hIjvh3s/LynzH3LTLys5u2jNZOihg1NT3SIdt3Wn3tyL5dv2sC JDuFxQ/oGL3BmsB3KG79ZlD4ZbGqfNnu0Cw26mcwlsEWwG0BSsajf4l1jxCIk78o+xyJ /ghBPNRLQtDdbSlzY+iZ3YSIGRmhyb3V3FlaUZ0JSu0krZS5IFqnE34WMoG3GPExS8y9 +9i2p/ADV2oAIjMdcfc01eYoC3GZca4VAIoJ0tiUgguDGXrpcvHXLZmPDyvWJQGEkEjX +j8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=L+ingdxVlBAhx25mIHmohRsrlSprqOSnQvcGnUxqFXU=; b=bjEXofC8ibuV3SOFkO/sfzIEm04Q+ptJEmKF0e2DLiHjMIupioV+mf5e/VCZllUlyX /pOASHxZzVhu/DdEFctWoUqqDdTPmvE9RGTFk0XrBCWVlVuN2sD5c83YRiv09ctyOMcV VfaVVuuYsICglhuTuvTSly3NUIJHTnAhy4b1Wsl1ycw0C9/nW5V3ZWPq6C9Ho0xIdFfn iCPjaX1EZ8WZIbKHz3Ucrhi8D3uz5hVdQKzp6rZLJYBEn7G/rmoyqq5YgDDD/egHZe5C 8DdG53e9NN5MZS/c0lKVxrbDSjcBTR/3qyafpqfcv62awchOAIfvvJTjuxu+aUzwc7Xg 2Ebw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=K7QrebmC; 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=fairphone.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t5-20020a170902e1c500b001a67798316dsi4160707pla.261.2023.04.21.07.18.14; Fri, 21 Apr 2023 07:18:27 -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=@fairphone.com header.s=fair header.b=K7QrebmC; 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=fairphone.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232098AbjDUOLy (ORCPT + 99 others); Fri, 21 Apr 2023 10:11:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232360AbjDUOLv (ORCPT ); Fri, 21 Apr 2023 10:11:51 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43CDA1259E for ; Fri, 21 Apr 2023 07:11:45 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-94e53ef6815so235966766b.1 for ; Fri, 21 Apr 2023 07:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1682086304; x=1684678304; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=L+ingdxVlBAhx25mIHmohRsrlSprqOSnQvcGnUxqFXU=; b=K7QrebmCX4fOWCWQ+IN56eGYHw2eCyT52m+HN56/5dQf+TwupwcfBoj6ORZLog0nno VlpAEcKOcF1iv0a8wW6mhOupvnSXzv4+/hLin/GL6MbhdD+9KfeIWrDD2zabw6Ewl4DC lqpNJ3IWgWaxhH/QMqzKeB2+UsPhT00dLiBprlLlJqZelnD90pTg7yj7ibmB4ILLUkak kzEFxMh6i8+xFZc9U/mQoACKz26bNYF/+0afIcGmc6ZNBigVYyM7/oxx79+uo2DfZl4z VE1eMeY7FK57OQ7e6FDH2BMCP1+bUE7OsY07DfJeOPUFiqe9FlGJd+sbuN2/bQX8caW4 QasQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682086304; x=1684678304; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L+ingdxVlBAhx25mIHmohRsrlSprqOSnQvcGnUxqFXU=; b=NpkhFjiyWtaK52ieWY0l5R5BYXTHGC620eQlJCUV1G4MN0MTJZgFhGVaSzQ+cUjh4z DUYdHC5tICQA4dpTKod3ZF4CYneo2X2EpoZXnJmfPZtQEjiWDXRbKOY/rkIUujONqyIp nm+eXmJdHhwOXsLcGsD5ZPdAk2nz+sVpYptGS4C3Q5Y97woYodMdL63Tiy1LIXcrRXOi f8Fo3awV3Ij1a/UZO73g9g1Tuw7Sz9s/KkXDKLt4pSzuuZLp0alGin4AfBosxKbVFX17 4olLN7+7wENkXmC0zgO73nrTk8x1L/Z627VgI6OzKd2f/9qpwPmnSeXXHfDAKbn1JhJy 6zOQ== X-Gm-Message-State: AAQBX9eHXFY+324MArpNEaplEtGl00iRMvcdRZXWawXgBv2K5d+uNL0s mHaSC19rPpUA+SiIKIW8nMpT5g== X-Received: by 2002:a17:906:7e45:b0:94f:5079:ade2 with SMTP id z5-20020a1709067e4500b0094f5079ade2mr2473933ejr.62.1682086303670; Fri, 21 Apr 2023 07:11:43 -0700 (PDT) Received: from [172.16.220.31] (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id mb20-20020a170906eb1400b0094f432f2429sm2104299ejb.109.2023.04.21.07.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 07:11:43 -0700 (PDT) From: Luca Weiss Date: Fri, 21 Apr 2023 16:11:39 +0200 Subject: [PATCH RFC 2/4] Bluetooth: btqca: Add WCN3988 support MIME-Version: 1.0 Message-Id: <20230421-fp4-bluetooth-v1-2-0430e3a7e0a2@fairphone.com> References: <20230421-fp4-bluetooth-v1-0-0430e3a7e0a2@fairphone.com> In-Reply-To: <20230421-fp4-bluetooth-v1-0-0430e3a7e0a2@fairphone.com> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Balakrishna Godavarthi , Rocky Liao , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Andy Gross , Bjorn Andersson , Konrad Dybcio Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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?1763795752159006636?= X-GMAIL-MSGID: =?utf-8?q?1763795752159006636?= Add support for the Bluetooth chip codenamed APACHE which is part of WCN3988. The firmware for this chip has a slightly different naming scheme compared to most others. For ROM Version 0x0200 we need to use apbtfw10.tlv + apnv10.bin and for ROM version 0x201 apbtfw11.tlv + apnv11.bin Signed-off-by: Luca Weiss --- drivers/bluetooth/btqca.c | 13 +++++++++++-- drivers/bluetooth/btqca.h | 12 ++++++++++-- drivers/bluetooth/hci_qca.c | 12 ++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index fd0941fe8608..3ee1ef88a640 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -594,14 +594,20 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, /* Firmware files to download are based on ROM version. * ROM version is derived from last two bytes of soc_ver. */ - rom_ver = ((soc_ver & 0x00000f00) >> 0x04) | (soc_ver & 0x0000000f); + if (soc_type == QCA_WCN3988) + rom_ver = ((soc_ver & 0x00000f00) >> 0x05) | (soc_ver & 0x0000000f); + else + rom_ver = ((soc_ver & 0x00000f00) >> 0x04) | (soc_ver & 0x0000000f); if (soc_type == QCA_WCN6750) qca_send_patch_config_cmd(hdev); /* Download rampatch file */ config.type = TLV_TYPE_PATCH; - if (qca_is_wcn399x(soc_type)) { + if (soc_type == QCA_WCN3988) { + snprintf(config.fwname, sizeof(config.fwname), + "qca/apbtfw%02x.tlv", rom_ver); + } else if (qca_is_wcn399x(soc_type)) { snprintf(config.fwname, sizeof(config.fwname), "qca/crbtfw%02x.tlv", rom_ver); } else if (soc_type == QCA_QCA6390) { @@ -636,6 +642,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, if (firmware_name) snprintf(config.fwname, sizeof(config.fwname), "qca/%s", firmware_name); + else if (soc_type == QCA_WCN3988) + snprintf(config.fwname, sizeof(config.fwname), + "qca/apnv%02x.bin", rom_ver); else if (qca_is_wcn399x(soc_type)) { if (ver.soc_id == QCA_WCN3991_SOC_ID) { snprintf(config.fwname, sizeof(config.fwname), diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index b884095bcd9d..fc6cf314eb0e 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -142,6 +142,7 @@ enum qca_btsoc_type { QCA_INVALID = -1, QCA_AR3002, QCA_ROME, + QCA_WCN3988, QCA_WCN3990, QCA_WCN3998, QCA_WCN3991, @@ -162,8 +163,15 @@ int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr); int qca_send_pre_shutdown_cmd(struct hci_dev *hdev); static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type) { - return soc_type == QCA_WCN3990 || soc_type == QCA_WCN3991 || - soc_type == QCA_WCN3998; + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + return true; + default: + return false; + } } static inline bool qca_is_wcn6750(enum qca_btsoc_type soc_type) { diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 1597797ff169..96b837410a6b 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1835,6 +1835,17 @@ static const struct hci_uart_proto qca_proto = { .dequeue = qca_dequeue, }; +static const struct qca_device_data qca_soc_data_wcn3988 __maybe_unused = { + .soc_type = QCA_WCN3988, + .vregs = (struct qca_vreg []) { + { "vddio", 15000 }, + { "vddxo", 80000 }, + { "vddrf", 300000 }, + { "vddch0", 450000 }, + }, + .num_vregs = 4, +}; + static const struct qca_device_data qca_soc_data_wcn3990 __maybe_unused = { .soc_type = QCA_WCN3990, .vregs = (struct qca_vreg []) { @@ -2359,6 +2370,7 @@ static const struct of_device_id qca_bluetooth_of_match[] = { { .compatible = "qcom,qca6174-bt" }, { .compatible = "qcom,qca6390-bt", .data = &qca_soc_data_qca6390}, { .compatible = "qcom,qca9377-bt" }, + { .compatible = "qcom,wcn3988-bt", .data = &qca_soc_data_wcn3988}, { .compatible = "qcom,wcn3990-bt", .data = &qca_soc_data_wcn3990}, { .compatible = "qcom,wcn3991-bt", .data = &qca_soc_data_wcn3991}, { .compatible = "qcom,wcn3998-bt", .data = &qca_soc_data_wcn3998}, From patchwork Fri Apr 21 14:11:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 86338 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1099589vqo; Fri, 21 Apr 2023 07:13:59 -0700 (PDT) X-Google-Smtp-Source: AKy350aNmxAXjphtbApBw4QooHehVrO0mf+xoQWmsqyRg7SpMhOAB+2lg54higCVQ0hkbaOkneKP X-Received: by 2002:a05:6a20:1453:b0:d9:2d4e:c08c with SMTP id a19-20020a056a20145300b000d92d4ec08cmr7166883pzi.61.1682086439199; Fri, 21 Apr 2023 07:13:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682086439; cv=none; d=google.com; s=arc-20160816; b=hv7eh1uULmZGCtW73SkHatp3XmfUp7EKD+Ug7/2UeLnY4BhvmCUXg2/VOtOMiDNgK/ mcJI33p+hPOlUWHFGpbdxPQNAeD5zcXJImMHhTmkXoQ452o68YWfUrlq1zUFkoBdN/nP cQyfUrAI9B0BCFFPg8tT23PRIzAUhBRapbiXa4QrN9pX+bbBP6gfWNNfHS8sYSWZ1Xns ZfywahH6Nof4gid7aAXlWE1X6pZLsSkjd6sXRG4S/HdvBtMpeqo5yq36nAXZ7vlc26mP f3KrlxSNAW8ir1DTbDghUbk83GBs2CHieYkZR5z/xaBmvj7qFtYAjMWPYq1q3gJ3N2Bf OtnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=m46VLD2JzGlramKy/E9COqcajcCIODXlIHm11HTuzOE=; b=sfNM1WReegNnqo2jm3s/nznlh1rS2oiEVGwnw29g37kmAY29zpYPWnEZ6Lhvxb3wGL p1OXx5oqTan+IAen5qd8nJrJRhxocn9JuFVHfo/5TDgPvqAt4WyCTrjMOwoFvQMM9kvP 9t0q6r+SLxtcliwckqe+NugPgOKX3HdBXUviH1kPKB2o/4Z2Ma4556LPhJWXsrbQHUJx U0Ew1dli0bk+/EUdTVMEhWUsJBM21kJ7NVVEP9XvyOH/p6lsEWpU527CeDMcaukbdyjj lIsfWu5mEfJUwskZhQz59ZvvFzjhVCSWaeOpM0kl1sqe7MWVva+/aBATHKee8mLcpE25 tMgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=zkCuK8CQ; 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=fairphone.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a9-20020a654189000000b00518a0139251si4254132pgq.200.2023.04.21.07.13.46; Fri, 21 Apr 2023 07:13:59 -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=@fairphone.com header.s=fair header.b=zkCuK8CQ; 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=fairphone.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232215AbjDUOL5 (ORCPT + 99 others); Fri, 21 Apr 2023 10:11:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232550AbjDUOLv (ORCPT ); Fri, 21 Apr 2023 10:11:51 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13CEA125B0 for ; Fri, 21 Apr 2023 07:11:46 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-94ef8b88a5bso233888266b.2 for ; Fri, 21 Apr 2023 07:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1682086304; x=1684678304; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=m46VLD2JzGlramKy/E9COqcajcCIODXlIHm11HTuzOE=; b=zkCuK8CQwZrSK4X+CfJq5XsJyphe5C+bUQ0PXube+pfE42fImAdmk4sATOhnWhNqdA f9dSC/KiADF8A/jn0l1ZrE1HWBxYtq/nvBWyJ+8+vhwlJOSIdkbYN/ekOMHwpsz2cG4e lk72ujRuCwnV2bNcLwtXE02SR0hHQGRwkZIUqJAQBvkTvOeVD1EsH66dhGH1J+9ylKL6 pjmM4LjT7piQvr2hmuq6jPtpILy2WB2fq5BvhD5boYSxMJ3B9s30v4pyh9M/4VaO2mwe bZMDwucBGAvgNj3qe+4l4P8MPclvP7pssxJKb5LtbRv8ZKt7qjAEt+ViLBL1MPlBkwJT suDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682086304; x=1684678304; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m46VLD2JzGlramKy/E9COqcajcCIODXlIHm11HTuzOE=; b=RLo4DSdN6pxM9GuFWpMQZvHbMP+5IGslHyKU3opuUFf+ec0mMfNRJ7gmngRQNsyG+s 6PWkl0pWBLTHXLEHnYZQxProyugS3tS1CGWcD6naXGDrPhvY9PA3m1TWqk4Sv4g/SdUS 2DYjQzhyFlObzI8g1qi20G2EzJ9AIl6Y7yBwoiFjHe8MIEF/ngsV3itLomxdYLzZjy+o k2w60qwkaXoxDV3bovo1YG+au73rKzfqEpdgg79Lc2iY7n+IpgEoAlLwfAP31US4koVh ainyiGW7kRBKoPLyQ4hZQ86ScXBdSOjlWzJt6Sj5jMLaCf5JTkhmQEqnJUPPPkiZd4ds c43A== X-Gm-Message-State: AAQBX9ewXrwoDlSD6Z3hZw3xCP4oNvtSTIDQa+rR4vVrRFj1zainHR7s XcFRoSM7ZWEuuPHB2hL7MVWJkQ== X-Received: by 2002:a17:907:7888:b0:94e:6f2d:d1c9 with SMTP id ku8-20020a170907788800b0094e6f2dd1c9mr2654828ejc.68.1682086304455; Fri, 21 Apr 2023 07:11:44 -0700 (PDT) Received: from [172.16.220.31] (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id mb20-20020a170906eb1400b0094f432f2429sm2104299ejb.109.2023.04.21.07.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 07:11:44 -0700 (PDT) From: Luca Weiss Date: Fri, 21 Apr 2023 16:11:40 +0200 Subject: [PATCH RFC 3/4] arm64: dts: qcom: sm6350: add uart1 node MIME-Version: 1.0 Message-Id: <20230421-fp4-bluetooth-v1-3-0430e3a7e0a2@fairphone.com> References: <20230421-fp4-bluetooth-v1-0-0430e3a7e0a2@fairphone.com> In-Reply-To: <20230421-fp4-bluetooth-v1-0-0430e3a7e0a2@fairphone.com> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Balakrishna Godavarthi , Rocky Liao , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Andy Gross , Bjorn Andersson , Konrad Dybcio Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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?1763795470121006921?= X-GMAIL-MSGID: =?utf-8?q?1763795470121006921?= Add the node describing uart1 incl. opp table and pinctrl. Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/sm6350.dtsi | 63 ++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi index 18c4616848ce..16c5e9a6c98a 100644 --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi @@ -378,6 +378,25 @@ opp-2073600000 { }; }; + qup_opp_table: opp-table-qup { + compatible = "operating-points-v2"; + + opp-75000000 { + opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-128000000 { + opp-hz = /bits/ 64 <128000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + pmu { compatible = "arm,armv8-pmuv3"; interrupts = ; @@ -741,6 +760,22 @@ i2c0: i2c@880000 { status = "disabled"; }; + uart1: serial@884000 { + compatible = "qcom,geni-uart"; + reg = <0 0x00884000 0 0x4000>; + clock-names = "se"; + clocks = <&gcc GCC_QUPV3_WRAP0_S1_CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&qup_uart1_cts>, <&qup_uart1_rts>, <&qup_uart1_tx>, <&qup_uart1_rx>; + interrupts = ; + power-domains = <&rpmhpd SM6350_CX>; + operating-points-v2 = <&qup_opp_table>; + interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>, + <&aggre1_noc MASTER_QUP_0 0 &clk_virt SLAVE_EBI_CH0 0>; + interconnect-names = "qup-core", "qup-config"; + status = "disabled"; + }; + i2c2: i2c@888000 { compatible = "qcom,geni-i2c"; reg = <0 0x00888000 0 0x4000>; @@ -1726,6 +1761,34 @@ qup_i2c10_default: qup-i2c10-default-state { drive-strength = <2>; bias-pull-up; }; + + qup_uart1_cts: qup-uart1-cts-default-state { + pins = "gpio61"; + function = "qup01"; + drive-strength = <2>; + bias-disable; + }; + + qup_uart1_rts: qup-uart1-rts-default-state { + pins = "gpio62"; + function = "qup01"; + drive-strength = <2>; + bias-pull-down; + }; + + qup_uart1_tx: qup-uart1-tx-default-state { + pins = "gpio63"; + function = "qup01"; + drive-strength = <2>; + bias-pull-up; + }; + + qup_uart1_rx: qup-uart1-rx-default-state { + pins = "gpio64"; + function = "qup01"; + drive-strength = <2>; + bias-disable; + }; }; apps_smmu: iommu@15000000 { From patchwork Fri Apr 21 14:11:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 86339 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1099861vqo; Fri, 21 Apr 2023 07:14:19 -0700 (PDT) X-Google-Smtp-Source: AKy350aMQdf99KP4nzn0imfCM7Vu2OGky8uFaiWFEe1DJEFVopvtjb5NkQVkaGw+MoHiEuttFn3c X-Received: by 2002:a05:6a21:3982:b0:ef:8b50:56b7 with SMTP id ad2-20020a056a21398200b000ef8b5056b7mr6090615pzc.60.1682086459242; Fri, 21 Apr 2023 07:14:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682086459; cv=none; d=google.com; s=arc-20160816; b=0ScdnmwletA6s1Y/DSVc1PYlVJySlQgbvBf6BvBrdJmk0WVhiCvDAGF97uyD9JvMoB b5sWdG79owXs6CjaoirEdhWSG5KLdiY67zQ1/c2utFr44+aBwNsKaXDE+fhUNrJqNTuM ma97gKk/0iQw8fGJa2Z8IZMwbKlYLsREk7FIHtLwHvDownfdFlah7vITV9W05OEe2mgg SszF7JLhvDEGjJUYk+ltCKhtbx0HAMoJZ3E1r3XpC9+bmFgIuuOV4lX3TdT1JzgvclpB I4dgKmiYyuOPKvL4b6Xa4nTAw5tV5n+UydWmNJmD9guzETKKYGj0oxw4YmxGKRYduK8c mjbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=5PDdlh4u/xfgKewafucHFDvnZU5PveoA4hr4MMyV4jk=; b=K4JKrtHXnipGESKcv5xdK7hdPKJVDX/YFmebF71r++z2afzw9VjdH7PYPAIyQ6ujnk kXg7jLMgsVrccs2n32IRU2YpErs9pSvaTtfXduv5QoaDGdgk8kdQiAk18511HjLUrDjd q+jv/irIrpAdhPvCMU2hSEeis+7Aoujg9KPriCY5A7WBFrGS0zE9NwRBkZWCzm+MfCzq VEd3HO11tTfKiirL6VyXJb5E7vVWfsL3Jm7XWo/0Bxz0KHgLQNNyG6hyB37/BtLg4ISb kbSvfLdyCJpUum5XntxTk+mSGNRcBO6q4jud64lbYZn7avTCvfjjKY1pkEYvlGZRhDDO aLSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=VKgUTyES; 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=fairphone.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k4-20020a654344000000b00513f15fed67si4250333pgq.517.2023.04.21.07.14.07; Fri, 21 Apr 2023 07:14:19 -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=@fairphone.com header.s=fair header.b=VKgUTyES; 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=fairphone.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232555AbjDUOMB (ORCPT + 99 others); Fri, 21 Apr 2023 10:12:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232434AbjDUOLw (ORCPT ); Fri, 21 Apr 2023 10:11:52 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A15F12C9C for ; Fri, 21 Apr 2023 07:11:47 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-506bdf29712so12634883a12.0 for ; Fri, 21 Apr 2023 07:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1682086305; x=1684678305; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5PDdlh4u/xfgKewafucHFDvnZU5PveoA4hr4MMyV4jk=; b=VKgUTyESHEzEfyEpyia7JO5LA5ceaG6BIWK/+IcQyWsjEzQK2Z00VNu7eATdp1i1p8 hE12aSAUGs1tSXIPEvUOsBQ/40WfNJhTw24BlcGWAAJsctNYN/GxAmXCejz40UJsRaqV WSOGYmhpdgyrHd9dBN78Cu336z+XJHJZlP/Cnw7yk3vozClDHUMDEgUT+dJ0TERGJqUK OtPDfFtQv/5jhi1LakBn2lfrB9OChaoSzsKrosp+qo/f8eu1dE9Ay8fp545y+5OttAP9 xT+MR41xOhjOSoz5O1k13DNUM0eNAY1LFYkxdY4I1Z10xq+/l1f6304MbBx4kuL5gcrR z/sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682086305; x=1684678305; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5PDdlh4u/xfgKewafucHFDvnZU5PveoA4hr4MMyV4jk=; b=d0+uaSk7p0y+XN6UC36euyCoAThOuSl3epufNzfxO94gAloueLkAWFi9P8D6Za/09Y lEgAyH7rl1oj88ziLpWUS8kMeIPjVZu0if5udxsVGacaqjkvKDgRonC7tcC/EcaAFtVi h0uvVzHI9cGNUwI/jVF23b2pPkl1ZLoJTVx45Uk7pIaXVyHMAirwhjG4MkfqBTJvkvrq 2Xtp/s0TOHOScdMVI0Aodx+MJWCKB+CWpHFbPDvTtPYneq52JPOltrPvgBP2QUxoDvYo iWq1CKVjZVzUkGiU5YQJjbpDLd24M4a+YDzZGe6D4PN5xUfuPW0KreooaSEd7b1mv8mk 5o9Q== X-Gm-Message-State: AAQBX9fvO5BRAoHN34Kl5sgLUfMdcccrfWAG1RTq1PALwdgdv0xsyPHY W0JVFxbwRg07uYiA/KXqJ1Sajw== X-Received: by 2002:a17:906:d14f:b0:94e:83d3:1b51 with SMTP id br15-20020a170906d14f00b0094e83d31b51mr2542062ejb.23.1682086305561; Fri, 21 Apr 2023 07:11:45 -0700 (PDT) Received: from [172.16.220.31] (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id mb20-20020a170906eb1400b0094f432f2429sm2104299ejb.109.2023.04.21.07.11.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 07:11:44 -0700 (PDT) From: Luca Weiss Date: Fri, 21 Apr 2023 16:11:41 +0200 Subject: [PATCH RFC 4/4] arm64: dts: qcom: sm7225-fairphone-fp4: Add Bluetooth MIME-Version: 1.0 Message-Id: <20230421-fp4-bluetooth-v1-4-0430e3a7e0a2@fairphone.com> References: <20230421-fp4-bluetooth-v1-0-0430e3a7e0a2@fairphone.com> In-Reply-To: <20230421-fp4-bluetooth-v1-0-0430e3a7e0a2@fairphone.com> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Balakrishna Godavarthi , Rocky Liao , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Andy Gross , Bjorn Andersson , Konrad Dybcio Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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?1763795491076051626?= X-GMAIL-MSGID: =?utf-8?q?1763795491076051626?= The device has a WCN3988 chip for WiFi and Bluetooth. Configure the Bluetooth node and enable the UART it is connected to. Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts index 7ae6aba5d2ec..35e2889c5439 100644 --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts @@ -31,6 +31,7 @@ / { aliases { serial0 = &uart9; + serial1 = &uart1; }; chosen { @@ -563,6 +564,22 @@ &tlmm { gpio-reserved-ranges = <13 4>, <56 2>; }; +&uart1 { + status = "okay"; + + bluetooth { + compatible = "qcom,wcn3988-bt"; + + vddio-supply = <&vreg_l11a>; + vddxo-supply = <&vreg_l7a>; + vddrf-supply = <&vreg_l2e>; + vddch0-supply = <&vreg_l10e>; + swctrl-gpios = <&tlmm 69 GPIO_ACTIVE_HIGH>; + + max-speed = <3200000>; + }; +}; + &uart9 { status = "okay"; };