From nobody Fri Dec 19 17:43:31 2025 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 845001CAA9C for ; Sat, 1 Feb 2025 17:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430959; cv=none; b=VJR737Q1nQnsrscGWdSWfXIT/T1awTXZZBwAd7v5LHZMFQ4Us2dp7RJpU9znOae6LqDe7/rcAW5qnFKH+BlUv/IygPQIfozyjAlAaZDk0nNSVSOxkdhfOrzOfDnGs81kIKGJfAJ1JN3ZLBjkd/IKXzf3AiWF35k/P9LYpqJllaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430959; c=relaxed/simple; bh=/d/geU3OxC4Nkibrq9A3Ew2gwBiXmZo2CHTH+6Gy0Vc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aRTD3LbDBJ9INGfMLPkGuBNrzaG0gcPoUGKaPM5YnJNtzjxhJa90mLKYy+9CvVZeqJRh1uj+fSREF2yRLZZSbnInXCd2IThA24J/MSDNMenuttJYbw8jp0rjCqBQ/sU2VgeLom0wDe5QDoNpcwpW7W2M3WwHbTzEcjkG+G7/q80= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=EEB+hGJG; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EEB+hGJG" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-30613802a6bso30717211fa.1 for ; Sat, 01 Feb 2025 09:29:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738430955; x=1739035755; darn=vger.kernel.org; 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=/Dk7ljpeNS9WkTUfxOFg/JBajDxdcbPw39k3Tq9ImKI=; b=EEB+hGJG23MUswaLIHug+zBcLaUI7FgHBF7+31DvCX+D+AsY+l2aEyGy9Id1ZVruIA O9ljf+Bh/HRUstbg27Zm4m15lPZ0Uimkri7CYLVsOiYF31OTark2MDaWoecwS6eWpIMS Je0MCtBtgxgx/xwOgIgHk54XMUTKKLu8oJTt8x0esWnzo7QmEBm08HZyIE6onfVMgUJF x7YzxvFv650YA/qvjF9v45MHUdVkIgAqGmLzJ6lIhaUv4buLAqDXsEtkXmATkZfkf2Gf UdK8rVJe/DHJDFYd6UcitkcUDmfi2IpCosIpA57V/Kh5AXDLdl9nbYEMo/914o6Cb2Dd zysw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738430955; x=1739035755; 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=/Dk7ljpeNS9WkTUfxOFg/JBajDxdcbPw39k3Tq9ImKI=; b=boQBgfb512YdHDUmvuGKCvNeMZEWgTZ5YUwR+FrvwDkY62s87ESAJN5HMR2TyN+s8x 8gs9Q9bnxoHGSSL6f68mL2QfpfjQqgCD3Dz77VGMBrWTgwEnCLO/yPyiQwZCvPJKlS0j dm53zW2QTP1cS9QgbKo+BkLUXUO2PPnf5CdfTTswyeyBKHAQSvDK/pXdCX6MhC279jlc RLsEbiJ//qjClZf2rTjN+AHpb/9isNYAnKI2HjcvkNf4uA/Pe3zONdVgy8Zy/U1H5uD6 NgsbbK+ETlLoCxhV6QyKkbrJsmFFIH7SSBaTbHeTqE4YsVTuhnKbHPzAtukUSQRdHvxJ pYCA== X-Forwarded-Encrypted: i=1; AJvYcCWLl7iGixRzxhAemg/Su4ljNy1+fIrGKPxE3VO70+1m/szAL2Z+wgiVBP4JIlaZC1rKH+2sD1jb6EOdVZw=@vger.kernel.org X-Gm-Message-State: AOJu0YwIgC09aLzvgeqqvWmGSXGh+DcpUi271LEE5Td6P6TP69rcWEIp YdUkSmpA7+MhBWHYCSHToa0JPpGRvaOdqJExbnIgt9FlMAU2huGf1HbiGd2uT6g= X-Gm-Gg: ASbGncurRItKYt6DXC5nN2ONVzTQtdbU+OMrbJZPrdX/PfcTqsz1jXP95cK679MT8mM U1S7rJkY0FSpfSO4iHxrwmcvHpF9xMfPhuD14PJdLUJLaAvy451Z2HJtQdM379t3GkM/wpEiyVg C7zZ6ayBjc4MHwiL4BB6yi3T03GFBLbTIL/eSs+ovSv1xolKJcJBFs6qYXA9rCL2do88M7lrIV+ WWT8lkM2M/7T2NldO+GTUsv9d0/Wb6h/HhNEruXZAOHkM8QGsv+/XDlaM+t2kkZB44okgWL+wey V6wGsPfCjhbO6M3ME9K+3mg= X-Google-Smtp-Source: AGHT+IFQxLdgqV1VuCmiSKzy7E+QXwyUiqyAdxyDy1lhNZkJAj2DiV+iFyftVtLTyzS01O4ux7Ueig== X-Received: by 2002:a05:651c:504:b0:2ff:a7c1:8c2e with SMTP id 38308e7fff4ca-3079694dd06mr58095141fa.28.1738430954016; Sat, 01 Feb 2025 09:29:14 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307a3099ec4sm8852161fa.48.2025.02.01.09.29.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 09:29:12 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Feb 2025 19:29:07 +0200 Subject: [PATCH v2 1/6] dt-bindings: net: bluetooth: qualcomm: document WCN3950 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250201-rb1-bt-v2-1-fd44011749bb@linaro.org> References: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> In-Reply-To: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> To: Marcel Holtmann , Luiz Augusto von Dentz , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Balakrishna Godavarthi , Rocky Liao , Bjorn Andersson , Konrad Dybcio Cc: linux-bluetooth@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1201; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=/d/geU3OxC4Nkibrq9A3Ew2gwBiXmZo2CHTH+6Gy0Vc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnnlnldnpgRM0nW8PS6YIAuy4YhrJbX7cj6BYnO B5keQ6cZ2SJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ55Z5QAKCRCLPIo+Aiko 1V2rCACNDKB2CIDYU4QR8+Ha7egrR/zbrKOgsECRWLewOohyIlcnXo6fluZVPXOuLXYY/fixjks YgDHawSRviONkIGOwNgN4/X+UCdXiu7KSuw6enXbGQaQEVBNtibf5gAkitbd2CmwxNa0ED+aNOq Wjcl3CC2MDkrUxnPnitHOBYvSIbUtSQSMbKXZrkm1khH4ueV0Rwao6VnvUdXJ/YMmlxdOqItlYm UxNJWpp7RiUl14118a+TgBlJAYgSAuzn7XE8P4seuArTn6vGNDLp7wCJQLAFHN8W3B2QGFkv0q1 uJxif8MdAL/sz/wvo29d22rFhq+dzE4wKfBkmf1E7Srwwr59 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A WCN3950 is another member of the WiFi/BT WCN39xx family of the chips. It requires different firmware, so document it as a new compat string. Signed-off-by: Dmitry Baryshkov --- Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml | = 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluet= ooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-blueto= oth.yaml index a72152f7e29b490003114dae1e36df85cba384df..6353a336f382e4dd689d1f50a62= 4079aa83b2ffa 100644 --- a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.ya= ml +++ b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.ya= ml @@ -19,6 +19,7 @@ properties: - qcom,qca2066-bt - qcom,qca6174-bt - qcom,qca9377-bt + - qcom,wcn3950-bt - qcom,wcn3988-bt - qcom,wcn3990-bt - qcom,wcn3991-bt @@ -138,6 +139,7 @@ allOf: compatible: contains: enum: + - qcom,wcn3950-bt - qcom,wcn3988-bt - qcom,wcn3990-bt - qcom,wcn3991-bt --=20 2.39.5 From nobody Fri Dec 19 17:43:31 2025 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87EFE1CACF6 for ; Sat, 1 Feb 2025 17:29:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430959; cv=none; b=utgH4uIOmfPAjDSi04d/qqFBgINEulXSdct2AD4df2a3srk71nxwMctSkh+2sL/9C5iMQ6I6SPRg3lt3k2aHhl43X2RiRbQ6o0bBN9/p55SBy/8kNvYhalMHozaC1H3j104u8yMEwIPsCLI+RiuT7E2RqCUqWxABb2trx0qtjik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430959; c=relaxed/simple; bh=XL7ng8U88IdS02LpqkHkwAED27Q7ZWUI6j1I8zn2UOs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=p3ke4usg75HCAqoZHwe7GPXunjyIkQHUqFebQ8J8Vssuu9yh1925f3mk/FaoViEy3RCdaFbGeIynuXq6V/m8mylxviD4odPtXPbKl58GhArZBqm7vJh2gqklN38+A+xlXUMGfl5lhDt1MbAXy5VPfxjQtEwtxas0lfiws/NkKJs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=KfHwvFmB; arc=none smtp.client-ip=209.85.208.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KfHwvFmB" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-30229d5b21cso22303361fa.1 for ; Sat, 01 Feb 2025 09:29:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738430955; x=1739035755; darn=vger.kernel.org; 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=0uDfHhxafnqOPaFWheOWVq1hqVSH+SO7a7CETbeXIaY=; b=KfHwvFmBZyLa2PSSusFUe30jY6VCcqpEH06RwFDkfRoCLpv0VUvd2s2/DuUq9KEYjh 8YzE4kmn5e3I5uAzjdoOSt2pttJp3K6TeHq77vQYwjbqR28ujLGBgtIzEDD4JmWszZYc bq3iAREoPL1aitzvK1ZMOciiY8DZKTHWKBK1Zxcu2gaLimhG2VXltOdK14yggJtqZxA9 fx8Ivtoy/L7Ct7CY9VopzPehhRGRGzdb2orqvtYAxOOo6S6fii4gUqZ2KroeeeuoX80I EJ4f3P6ZhtxJe9efoZEzcxhuV1x4Vmi+qwQavvqTm162yvWTuiPYlYEiPGbxlQBAYoV8 36yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738430955; x=1739035755; 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=0uDfHhxafnqOPaFWheOWVq1hqVSH+SO7a7CETbeXIaY=; b=lpW44tZ+n6CXW1n39IcTVthZCOa2mtkMdNfloCg14scym2MVg4Gf8L5QgEFVstSQAU PNcolX8sRotYRELy7gJo410su6F6c5W30Up1AVsVN/lPneZ3IIsvto/mDhngRpPS/XiQ LDta88Ukyr3xJfUt7sVPkZ2UPyYfOu2DclEB6a0TLMs056r1Gf3IGdRSP5wjQ9/SWBU7 ufvboj//ldi5+wlpkEDuhDNmzvvWs76YJCvQeRckEMcDdm+OV9vOJkely3fvZRWvBrWI GjhL/K81koH4QPy6/0RY3Ke8bsE1NSm3o+hUzSCB9PdaECJo7w8LTCUAkP/WbOL1lQ+q cmig== X-Forwarded-Encrypted: i=1; AJvYcCXI0byknsh2jvQ2eqz/JCX9zJVYnClQGdCBT4ssGvkbbMS1mt7L2QGs5H9NyHxaw/lkeEZsY6cgGJM9Uq4=@vger.kernel.org X-Gm-Message-State: AOJu0YyDyJr8WcQAH3cmxG9cast8SPVvlA5R2mqcmwWzrRgYtLBMf7KQ J/b9R673bGu7e1MAIxoU8vhrsaOUeimheVssUjocqnphWu+itnbasmb1jTM9yJY= X-Gm-Gg: ASbGncuuD48BGlkGBQh39D0ABLE6JtrDudMub1zf4ZHanrqKqmAtFOojUf5weUDvNPp jvsjbnuGQeuri91SW97OUYkoTmAMbmRcm5TgbtPc1y7RZ9wBTkv9KooUpcWVbl1R1K0dwNfOmvh SPMD1e0tqUZpxr8ym9G5NSAlm9W9aRr70eFOb/79ZxczXN+FZuDX2QrWjGbDNrF53U91u0d9ucZ j4KWeUfKGnbkWaGMX6uRTZAPNEQJn78avYcdF0KIHH8EZKS11hmbEzpVtE99i1+80padCVa4/HB G3/dTVqbAI6gechIOjH1w8M= X-Google-Smtp-Source: AGHT+IE8Hr0IX1pCMwiAV7uh2gFAGtFlcOaMwnAab/6lNNmleqqSsFzR5DBmNYTKJ5CEK4pnv3A0/w== X-Received: by 2002:a2e:a883:0:b0:307:95de:e3ed with SMTP id 38308e7fff4ca-3079695147bmr48071951fa.29.1738430955520; Sat, 01 Feb 2025 09:29:15 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307a3099ec4sm8852161fa.48.2025.02.01.09.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 09:29:14 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Feb 2025 19:29:08 +0200 Subject: [PATCH v2 2/6] Bluetooth: qca: simplify WCN399x NVM loading Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250201-rb1-bt-v2-2-fd44011749bb@linaro.org> References: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> In-Reply-To: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> To: Marcel Holtmann , Luiz Augusto von Dentz , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Balakrishna Godavarthi , Rocky Liao , Bjorn Andersson , Konrad Dybcio Cc: linux-bluetooth@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1590; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=XL7ng8U88IdS02LpqkHkwAED27Q7ZWUI6j1I8zn2UOs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnnlnlKDKbhsJaGXbR4PVQjNYuqdjhhv6ocj8q7 i/6BfARIcOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ55Z5QAKCRCLPIo+Aiko 1fYtB/41pLaxBJKwD+/915Gb2NS7XQyQthMPAb770YCfU+7esQ1bltInu1iz1OdsV1kglAk5BCj W6KEuaGZWEm2z0Gv/zn5v0tsRF00jBbs/Ve6Mw8tXVpq26884M8wuDbwOirVy6ZGprjRIKlkAQv wWAOtdyA81ML/lJqiv9Uub3AVIK6AyquLi3LZiq+eCd1wHObd6BNBaR77gBdpm7aAKgt03bliZp 1AvX/WghLA+7XA8cl7LVmUeRZXOI57r1fUZ6Hm4aVAM6GPjVUy6+R7kKSqqo9TdmezMOYbXkLvG ahiheDRCGEiY/6KPled/jtQXFsx4W7U2n7bZvLMTP8FLjZKC X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A The WCN399x code has two separate cases for loading the NVM data. In preparation to adding support for WCN3950, which also requires similar quirk, split the "variant" to be specified explicitly and merge two snprintfs into a single one. Signed-off-by: Dmitry Baryshkov --- drivers/bluetooth/btqca.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index cdf09d9a9ad27c080f27c5fe8d61d76085e1fd2c..7d6b02fe2040ff16d9d62de6835= 71e1e1900fe85 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -785,6 +785,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudra= te, const char *firmware_name, const char *rampatch_name) { struct qca_fw_config config =3D {}; + const char *variant =3D ""; int err; u8 rom_ver =3D 0; u32 soc_ver; @@ -883,13 +884,11 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baud= rate, case QCA_WCN3990: case QCA_WCN3991: case QCA_WCN3998: - if (le32_to_cpu(ver.soc_id) =3D=3D QCA_WCN3991_SOC_ID) { - snprintf(config.fwname, sizeof(config.fwname), - "qca/crnv%02xu.bin", rom_ver); - } else { - snprintf(config.fwname, sizeof(config.fwname), - "qca/crnv%02x.bin", rom_ver); - } + if (le32_to_cpu(ver.soc_id) =3D=3D QCA_WCN3991_SOC_ID) + variant =3D "u"; + + snprintf(config.fwname, sizeof(config.fwname), + "qca/crnv%02x%s.bin", rom_ver, variant); break; case QCA_WCN3988: snprintf(config.fwname, sizeof(config.fwname), --=20 2.39.5 From nobody Fri Dec 19 17:43:31 2025 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C0F11CAA88 for ; Sat, 1 Feb 2025 17:29:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430961; cv=none; b=mtMHnw04+CHDBjTiKrCark9zFKj3GYrv/0nbkIJxppqC2UI9xD0Be9UD8ViFA+G1PWv2sUBSNn/PJ0o558mK/VSmQ7ILuDvOTu2s/2rfG5ff94GIvX5/z2M7oV32kimC5K6xuZuUZWQ+CvYEljEIf3RZo5MNVlb0IsuLMrf7aME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430961; c=relaxed/simple; bh=ycOIHYAGFDD1jOlWhLjzqCD5G1p8AhMZpp9cNcyiiKE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rvLr3Ic0CwvOXYDPwqUo0M1pfsXDqB9iYdx1rKcoyjKCQdZYl25PGt49uv3IDT4WtyP3TsGu76gXY9z6XHnedu3dt3YcxDU8fGXJj/6jB4TJVoG0a1zXTao9bc8lW7aud6s2O0csJrVEJapKL3/pavlAitF2xE/r8qrLp6+/FH0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=VM8ce+he; arc=none smtp.client-ip=209.85.208.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="VM8ce+he" Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-30229d5b21cso22303531fa.1 for ; Sat, 01 Feb 2025 09:29:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738430957; x=1739035757; darn=vger.kernel.org; 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=FZZ4xyfo+uc3x26XGH79TmF64JJh5ei0Vih4JbnvUzI=; b=VM8ce+heo0GZZ6sIpk5iqRiWG5zn/5u2WX/qfCMfpTO3Y1LB5P1N5Saon75fKHhZMW /fsL03PcyeFUkFlpU7QOD9rYOLZ/UgKGaB6LeMpv7WitrNN9rLDFADQOxx//4Tu5gj62 1N2iDhh8GaYoFip9h5Ya9Vya1ZnjcVJHPqeiX+6gyZdkzvADyubESUEKH4Hp4kaAi2wJ BY1cE+rLvjAFI55ZTOKpduuCO+lIuZUzSSuV7WgEiLXMT/uUrvdIoA9ukLT7rbX96NKt FjwrTS5v83/V/3ogxiQTY9IzcA1FkcVhr/vomnWX9dr4UClMH3Nhy4020ra81xCMq7RV Vj6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738430957; x=1739035757; 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=FZZ4xyfo+uc3x26XGH79TmF64JJh5ei0Vih4JbnvUzI=; b=jccZDQ3mobgEh5vyWHZpB5eIq8taFonfxNJRvRe4EyWe0NIYDsqKM6T/VqvxVrP11E L6xuEzBfuUw9wvhJxPWxXJw2mOcBVOrldaqCS7c++pdSOA8dFY/eIDTUtAiXlAf/wpDy J+FtZYjKx0QRA5g4e7mhg6fyLPUzzVpl7anOaWrEB0+HcJqUt69pb4rkPWjBXbEYcFVK sa7hMBdnvLBHr8qlHBJNEL5QMU4ee2rptNfn/nju9h0D+6EMYB2N0WTA5g6dSjb1husI JXcXYOorT0dj8LGcx6VTLKBKSWA8UVRpPV5j8T+8ULnlZQqCMb5JEuE9kz+6cKHLvPHu DcSw== X-Forwarded-Encrypted: i=1; AJvYcCXuHx2FfBZZ/y4v6/H/lMcmtMqPK0W4F+2uAqd8IKRfm3oTcvnN58ZHIAsMdFaPgCqLOl9mZXaKVHJVVM0=@vger.kernel.org X-Gm-Message-State: AOJu0YwHx7HMKx7TIEv29IW869AfIg6AU2p/22BCQFVbZNJMMvnjgi40 VHUiIIeQmkxYMeaEfdF8LEAjIDVUJYM/aoSp1TJolyUO+FT6Lt/LzYC49Lo50VU= X-Gm-Gg: ASbGncvBPd8tZ9Jr9qtql9JRopwaFo37EKrE/71VWMXgNABcSpBcSbmRZaGUflZXZRy t7Ygie2Jyh+FBK6QaoY2ubM8L03YAdY2ootDvCEgbXl3kxNKuooiDEdNQRQGhXPfgxURL7BYCWo JNZqT3vhp5TbAurYHZIT/nlRqK7zeznc1rVBqJa9ChnP7xbXZkiDUpt6ukWObCm+t8dP0bEVHpo qvTUe+qGlY2Fn2z2TM3mK3zpApGPWG5aGPIdQlZ+2nweKJShjFpsNxbAE4dCkTv+uM0/2bbGJ3F 1Bw6NMnBxJCui7qbMlcLyx8= X-Google-Smtp-Source: AGHT+IGsx8Aj/IUcm36x0Eks9GyNFCiz2stzVn5fA9ymhZlqpLodClQHlPacl7JkgrfQpXFxOBb4nA== X-Received: by 2002:a2e:a10c:0:b0:2ff:d2e4:8dd9 with SMTP id 38308e7fff4ca-30796968ecamr63106101fa.32.1738430957139; Sat, 01 Feb 2025 09:29:17 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307a3099ec4sm8852161fa.48.2025.02.01.09.29.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 09:29:15 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Feb 2025 19:29:09 +0200 Subject: [PATCH v2 3/6] Bluetooth: qca: add WCN3950 support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250201-rb1-bt-v2-3-fd44011749bb@linaro.org> References: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> In-Reply-To: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> To: Marcel Holtmann , Luiz Augusto von Dentz , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Balakrishna Godavarthi , Rocky Liao , Bjorn Andersson , Konrad Dybcio Cc: linux-bluetooth@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6629; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=ycOIHYAGFDD1jOlWhLjzqCD5G1p8AhMZpp9cNcyiiKE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnnlnlol6Zu9ssdVrSRXGZXwmN5ayg/ZytqP9rs OHOv6yxpUSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ55Z5QAKCRCLPIo+Aiko 1SWVB/0WKcV34oFniOCnTOMcluilYRA/TWn5jIM2Yvatqx8Q3ramqzk5KIaTaSooquAAr7JKG+q HjIQkHhdv2LP1wfYcnVOqTf3G1ySPEYDS58IrBgkHwRy1my4PEOIj0iqbG2DWRB+3m55tKTIyob dm1ExC2vOojPWvdbr7zcDJvijiPoHZe3fHYgqp3vRdfUyMPiau9aQgihTAv2r1qgcS2RUkBUkVz WTvl7HudzWqNMle3ZGzr8nYsTdEz8ZxMtbKc1CvWXv4TW5FlVhtEmFd+wP1em6wUfqOvdbWjPW+ caZCV29ViEZWJyoAmUPQTRtZOuhATtDMIYKMYL7hOxYgH56C X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A WCN3950 is another example of the WCN39xx BT/WiFI family of chips. It requires different firmware files and has different current requirements, so add it as a separate SoC type. Signed-off-by: Dmitry Baryshkov --- drivers/bluetooth/btqca.c | 14 ++++++++++++++ drivers/bluetooth/btqca.h | 4 ++++ drivers/bluetooth/hci_qca.c | 25 +++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index 7d6b02fe2040ff16d9d62de683571e1e1900fe85..3d6778b95e0058beda3f0500b21= caaef8e797d32 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -816,6 +816,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudr= ate, snprintf(config.fwname, sizeof(config.fwname), "qca/%s", rampatch_name); } else { switch (soc_type) { + case QCA_WCN3950: + snprintf(config.fwname, sizeof(config.fwname), + "qca/cmbtfw%02x.tlv", rom_ver); + break; case QCA_WCN3990: case QCA_WCN3991: case QCA_WCN3998: @@ -881,6 +885,15 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudr= ate, } } else { switch (soc_type) { + case QCA_WCN3950: + if (le32_to_cpu(ver.soc_id) =3D=3D QCA_WCN3950_SOC_ID_T) + variant =3D "t"; + else if (le32_to_cpu(ver.soc_id) =3D=3D QCA_WCN3950_SOC_ID_S) + variant =3D "u"; + + snprintf(config.fwname, sizeof(config.fwname), + "qca/cmnv%02x%s.bin", rom_ver, variant); + break; case QCA_WCN3990: case QCA_WCN3991: case QCA_WCN3998: @@ -947,6 +960,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudra= te, * VsMsftOpCode. */ switch (soc_type) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index 9d28c88002257bae31249457b98a5df1df26efe4..8f3c1b1c77b3de8e7c86578aa3a= f17aefe99dab3 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -41,6 +41,9 @@ =20 #define QCA_WCN3991_SOC_ID 0x40014320 =20 +#define QCA_WCN3950_SOC_ID_T 0x40074130 +#define QCA_WCN3950_SOC_ID_S 0x40075130 + /* QCA chipset version can be decided by patch and SoC * version, combination with upper 2 bytes from SoC * and lower 2 bytes from patch will be used. @@ -145,6 +148,7 @@ enum qca_btsoc_type { QCA_INVALID =3D -1, QCA_AR3002, QCA_ROME, + QCA_WCN3950, QCA_WCN3988, QCA_WCN3990, QCA_WCN3998, diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 0ac2168f1dc4f8ae2f7a3b2912e7f5b5b8115cac..b39889ce0e8ff9d97f72eb8e70c= b9c6825984c82 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -623,6 +623,7 @@ static int qca_open(struct hci_uart *hu) qcadev =3D serdev_device_get_drvdata(hu->serdev); =20 switch (qcadev->btsoc_type) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -1366,6 +1367,7 @@ static int qca_set_baudrate(struct hci_dev *hdev, uin= t8_t baudrate) =20 /* Give the controller time to process the request */ switch (qca_soc_type(hu)) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -1452,6 +1454,7 @@ static unsigned int qca_get_speed(struct hci_uart *hu, static int qca_check_speeds(struct hci_uart *hu) { switch (qca_soc_type(hu)) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -1494,6 +1497,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qc= a_speed_type speed_type) * changing the baudrate of chip and host. */ switch (soc_type) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -1528,6 +1532,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qc= a_speed_type speed_type) =20 error: switch (soc_type) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -1746,6 +1751,7 @@ static int qca_regulator_init(struct hci_uart *hu) } =20 switch (soc_type) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -1776,6 +1782,7 @@ static int qca_regulator_init(struct hci_uart *hu) qca_set_speed(hu, QCA_INIT_SPEED); =20 switch (soc_type) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -1807,6 +1814,7 @@ static int qca_power_on(struct hci_dev *hdev) return 0; =20 switch (soc_type) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -1891,6 +1899,7 @@ static int qca_setup(struct hci_uart *hu) soc_name =3D "qca2066"; break; =20 + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -1925,6 +1934,7 @@ static int qca_setup(struct hci_uart *hu) clear_bit(QCA_SSR_TRIGGERED, &qca->flags); =20 switch (soc_type) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -1958,6 +1968,7 @@ static int qca_setup(struct hci_uart *hu) } =20 switch (soc_type) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -2046,6 +2057,17 @@ static const struct hci_uart_proto qca_proto =3D { .dequeue =3D qca_dequeue, }; =20 +static const struct qca_device_data qca_soc_data_wcn3950 __maybe_unused = =3D { + .soc_type =3D QCA_WCN3950, + .vregs =3D (struct qca_vreg []) { + { "vddio", 15000 }, + { "vddxo", 60000 }, + { "vddrf", 155000 }, + { "vddch0", 585000 }, + }, + .num_vregs =3D 4, +}; + static const struct qca_device_data qca_soc_data_wcn3988 __maybe_unused = =3D { .soc_type =3D QCA_WCN3988, .vregs =3D (struct qca_vreg []) { @@ -2338,6 +2360,7 @@ static int qca_serdev_probe(struct serdev_device *ser= dev) qcadev->btsoc_type =3D QCA_ROME; =20 switch (qcadev->btsoc_type) { + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -2374,6 +2397,7 @@ static int qca_serdev_probe(struct serdev_device *ser= dev) break; } fallthrough; + case QCA_WCN3950: case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: @@ -2683,6 +2707,7 @@ static const struct of_device_id qca_bluetooth_of_mat= ch[] =3D { { .compatible =3D "qcom,qca6174-bt" }, { .compatible =3D "qcom,qca6390-bt", .data =3D &qca_soc_data_qca6390}, { .compatible =3D "qcom,qca9377-bt" }, + { .compatible =3D "qcom,wcn3950-bt", .data =3D &qca_soc_data_wcn3950}, { .compatible =3D "qcom,wcn3988-bt", .data =3D &qca_soc_data_wcn3988}, { .compatible =3D "qcom,wcn3990-bt", .data =3D &qca_soc_data_wcn3990}, { .compatible =3D "qcom,wcn3991-bt", .data =3D &qca_soc_data_wcn3991}, --=20 2.39.5 From nobody Fri Dec 19 17:43:31 2025 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8675C1D0E20 for ; Sat, 1 Feb 2025 17:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430963; cv=none; b=qcYld3sPq/DAWYzLrodrjV9dJdlzNMnM1TCp8BdcZt01TCXSWRkAcbI1OrYtpws7yupmLOUq+UpipyQ4Ak+dcaYwoSJfswh4AAqc8cPSPGGJ/8SxvfCMgZARPJmgvaGeYNkEevnnsO5cLD2e2seiGHMPYuw9/ejyt3bmYZmhGT8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430963; c=relaxed/simple; bh=bnFY74SBqBhj50zQ7HIO+wjy7JugjwXGjrF/pgpBgeg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tPFMCGMMVDTHMoPGvo4y4ehvBpnbKO4gd9qfYrRzoRVRMTRQb41BNjsxTpMbkSh+FE0LywXV6goA/pCdI1wbKJ3EYzNUjH4Ev8wC5Ce1PExKc8UGxG2qV7Y5i/6vVqtGP2lMaLT8AGGxjzVXQVvhhW7SN4n4KKvjvN++QKGNhJA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=L8BfN8gv; arc=none smtp.client-ip=209.85.167.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="L8BfN8gv" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-53f22fd6832so3342984e87.1 for ; Sat, 01 Feb 2025 09:29:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738430960; x=1739035760; darn=vger.kernel.org; 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=dl2JKZ1IRhnp1wS++WB7EWKXLLWje8GjFlU5tMr+N/Y=; b=L8BfN8gvRIXlMwSq3H3Hq7bOvyPtT1CEaXiq7Pt5UrEeerDfxnaAoIWsXbSK0JRnEC 47N6MMKNK8biL2TYlA3ZavhW2CAzkRSlqg1UKjbuMpEceyvBLDeGJSaKqkzUeenrgqpP 0AK1EqPRGgGKD2zQRtJ6VK9PKTYabNmw8lMUdMSHk8UqY1Zcc+bFUIePKk6bjO5HFJbz CPuuTr7lKatxPqG81j3Zc9KkkYlHNqjMNKci3LWNhdA3TKVtDjoIavF/8qpofKeKq82h pS+iBaNXq5CqfUxgsNmH9PvGZ7xqszg9FVhMdR++2WPGE8WQBxVCw8/jJBAvP4Ojolt5 aMiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738430960; x=1739035760; 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=dl2JKZ1IRhnp1wS++WB7EWKXLLWje8GjFlU5tMr+N/Y=; b=OYRorJgVal8wLJe74FlNgWexfYml1pDgiu3kiaJnzw1Q38jJZ2oZrT+SPFbsOpd10A nK+xkEHih/+Rc63GRSuoGsguzmYI9JJDv6o29RiTrwswiqmxYb0ffnmULuSopDxsIU/5 OILfP39/UC50IluPzE3t2XPHJtlgriQI4btxBspuvNHkweIUxh8N0kgOnIoZZGmTvdey s2M/aWx9b3DUV8YHlpeiLLrdRSppdUIefBSToLVEu2GiQc6wrvlJOK3nkIQQs2apVi+0 NSrrwBidLlLKQ5Nuxfvxxsen8k546unIq4CWO1RrMR5Wxu5ljwrxUu3XxehrrYGhGGZk L5Ag== X-Forwarded-Encrypted: i=1; AJvYcCXzWtkVQCkuFbUIKfebf63d2v5PcwuJSaH7mkK73SkR4pS8xbsxLoPRXysUAGGGRjVjWm24GvxNODVKZi4=@vger.kernel.org X-Gm-Message-State: AOJu0YzmhgTJaPA48UrwEHlIcHtQzyWNQ+eYeC/dtNJ6j9jbSM0HnOgP fXrVb3+rTHJfJ30vm6YAfkP2J9bjkATpzUSWK7X+AQ+2XjSYRexrvJ1RZuZeo9U= X-Gm-Gg: ASbGncurvBnstm6StX+5G9DzkZkGxgQuZiOSQc6EK9TFQsKuCexXSRddT6FgmEJYj7C LKS2WJcFAhyk3HAyG7/Bfngl+t/on2Wm+BIHDRIO9fYywPL5rG/iSXgtPb+xRZI3mO2eXIM3Vwy J6lCnostPBmt/J3uw3Yr5UnlOlfUyOP8bd2vko7n2RCrk9NUyNYuyBZJAa/mXmFwXX0y1YYaEzt eXabfSe3kPAtSsNpV6pZuP0xKcfUBiRz6Fq8u85vLCRo8rzk4X1HuKY5nPZbIw/NbuNoXxKFf0O bdVTu+yk3s61u0HjZxilbBI= X-Google-Smtp-Source: AGHT+IHMuKtjT5ZbuqY6KVm0e4CJvXi02Mis2Ir5adR5x1LTVk8zoitQukV4i3Qns0xfnUx56Acygg== X-Received: by 2002:a2e:bc24:0:b0:302:1861:6de7 with SMTP id 38308e7fff4ca-307968e0bc1mr48166981fa.24.1738430959669; Sat, 01 Feb 2025 09:29:19 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307a3099ec4sm8852161fa.48.2025.02.01.09.29.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 09:29:18 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Feb 2025 19:29:10 +0200 Subject: [PATCH v2 4/6] arm64: dts: qcom: qcm2290: fix (some) of QUP interconnects Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250201-rb1-bt-v2-4-fd44011749bb@linaro.org> References: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> In-Reply-To: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> To: Marcel Holtmann , Luiz Augusto von Dentz , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Balakrishna Godavarthi , Rocky Liao , Bjorn Andersson , Konrad Dybcio Cc: linux-bluetooth@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4082; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=bnFY74SBqBhj50zQ7HIO+wjy7JugjwXGjrF/pgpBgeg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnnlnlE8rC8lkPbmRRukx6muSKaSPXb735xm6PZ vw0rHkAGCCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ55Z5QAKCRCLPIo+Aiko 1bYPB/46tLJQKeUtmL0j3FPsYuCbrPRdXbsTbX6gxtGZJkCLdx8vNvu8r52iwUrE0GqXtoeYNW7 jR1I+CyfCkmNSGemwtXg5xZJ2P1eM/q5lXQ2O+fucXANn5oFg3tm7/4cFjuaiUDSk3S2FMHmiE0 5VEtD/UCNMmdHS5JLhNaTJRVQR7l3/cn/zTDNhv25U6tNTktlFpywnPbeIMkhpEwWygEJpMMnD8 UpJo0L1Do0Y+hrH1cWKy8Un0DXoWFARg8kJP7rJHKfFjGxWsEzAqJlH4qIArA2x9k8fjEacalUT gIhu6zsNj7/9e21dkrvFtXIJu7NiO4OFH6PK/oB/6WzBCyMO X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A While adding interconnect support for the QCM2290 platform some of them got the c&p error, rogue MASTER_APPSS_PROC for the config_noc interconnect. Turn that into SLAVE_QUP_0 as expected. Fixes: 5b970ff0193d ("arm64: dts: qcom: qcm2290: Hook up interconnects") Reported-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qc= om/qcm2290.dtsi index f0746123e594d5ce5cc314c956eaca11556a9211..6e3e57dd02612f3568f07f1e198= 028413f463c69 100644 --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi @@ -1073,7 +1073,7 @@ spi0: spi@4a80000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; @@ -1092,7 +1092,7 @@ uart0: serial@4a80000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; status =3D "disabled"; @@ -1137,7 +1137,7 @@ spi1: spi@4a84000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; @@ -1184,7 +1184,7 @@ spi2: spi@4a88000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; @@ -1231,7 +1231,7 @@ spi3: spi@4a8c000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; @@ -1278,7 +1278,7 @@ spi4: spi@4a90000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; @@ -1297,7 +1297,7 @@ uart4: serial@4a90000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; status =3D "disabled"; @@ -1342,7 +1342,7 @@ spi5: spi@4a94000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; --=20 2.39.5 From nobody Fri Dec 19 17:43:31 2025 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1208C1DAC90 for ; Sat, 1 Feb 2025 17:29:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430965; cv=none; b=CPp3HM/cSVPRy8NHeFTr+nt8SzYA8WzcoSfja+cUQUzatrvdHKT1QgSBZh2nVpxbU9k81Ph7r/gy4XSoGXMF+xzx5ISUpN/bt8CJkX+ZdzoiPUNhLBx9Q1MBvV6+ZpSpX0GH46A8RDR0WVSHcdVTtvQLNv1vugTJ1VxfN6I9h2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430965; c=relaxed/simple; bh=qi1V0XhBkBrxty8uIfZTcLxNTnebQC4tHcL8urIKw8w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iy76ft6gCMbYz4IfMwiZpN0oNjPQfrSryDNRb8kKb9r6fasa1T9I2/oQ9T3zYZ+Nz7j/OiXgDSpJ3HQyOYu49+ETSJORLR6KRl6szdXxlq6U/fUtCGjiV6QJ4lTw7BUe3GblIYz6HTDxKuovRcohaOfE2kxAoTUP7hULgzBA0kY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=yi11jmgW; arc=none smtp.client-ip=209.85.167.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="yi11jmgW" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-540218726d5so2862739e87.2 for ; Sat, 01 Feb 2025 09:29:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738430962; x=1739035762; darn=vger.kernel.org; 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=4GCW5ssE11TCosEFHQR+hT7DqL2XinuXrF8Jh/KlSvs=; b=yi11jmgWGmyKMCKHNZ9SUxbRm5qOvGcSM3rYt+A2VaTmaHLsoYHSRUf/+BlFC3vjBa 69dfQB/VCZV1veJiY6hf0JhADgQnw5+rhtdVHrLEhCN1Z5ugjP7sfDQO8TxuUDjaPNmc yJHLdXLrnjqvNnwSOrEG67JGFhNmUtBNZuXYiA2g3FqlES/ZWK8HzdHSHDWiQEcpiU9a nBUij+qvgHCbvPOOT+eqLJezq0gCUP+ETXCO/Y9ti1KGd9FwvaWA8nasPGNZ+5LQupoU DyKyKiwcj+0kZV2co4n+Xd8DURLKN3xllYi9lor+hV7+zJIx7zj9C0WVnVVBR3kJ1YXS hxJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738430962; x=1739035762; 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=4GCW5ssE11TCosEFHQR+hT7DqL2XinuXrF8Jh/KlSvs=; b=MuZFkegsSWu96djzGHte75W/EvheMraugHIBJR/9E1OHLb7SK5k8FSfDfxHnhShPj9 CfEA/+gJO+r/RBMxE3uySsJzRgX7sQ0FwZT92H6YHW/eyg8VSImCxKqIeuvp7gmrAtsX 1eAdNfCi2WI/wzE4RFHiYbJ1brjHUvgUFTYtPDCEKh1LSZa0aOzpR3xdeOz4LlNZIi/5 QfSwRQZ4GTkUIN2gNq8EmS/WJMQ/5Ri1SdeOI9TcLO3SuJ1KbT3Xki61pwlb1OYkoXmc SVpNB10yT8NGnpy3Rm/m/dJslh8NKCNHvQbeyzsAPT6xyJF3f/P7g7MOszf+XiczKjdi 3C8g== X-Forwarded-Encrypted: i=1; AJvYcCUZWkJazqYaRBCZWOpzjGQdr3wa3VfACl6+IkOLA0WxIOmGFmBtRE9f9ejsFCC2gVZ4KW5qdr8jHvQ6weA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8GUX9NXBGpbQeAQnHYiG+KB79zGTdbs8UCIT1IuUQ1qhsmBh6 GsS9//bPG0pFs3gHf/ytHwBP1b6w2kqBACPXvNmlVek4ov1b4gE5N/tW65DnsWk= X-Gm-Gg: ASbGncvD7IkM2Z5+gog8y1l98njqyP0WVHo3M4+b508T5RGoACvxewyNnde8t9s9p+U oTYO3cTLHo8cgKdhDwExGJff8keOUvOWQqn3Jm4kosqzuzBEWZDWyyHOWur1Sh4PFbRRRDCn9tb kaLXk55KyuzB1ZFXVFU1xmkJLu738SkcTSkgXUdxuWaUIrhb3k1TIa0FqzLinBG72xjTYnq0arn R04XeN13xWqdnBmtSFQCk389wzoS1tplgZiwaUVuOzB+FTVL4igOwn9ze66wkLU857VXOVr+iuZ AnjB19ZK8yFTDcg9LpvU8Bg= X-Google-Smtp-Source: AGHT+IE/egWzoIxIC7qlxnnTh8Q4g8zC3DelMYJ7cykonZ2+ZVgY2BA2oCs2K5yshFXnch16WyAXZA== X-Received: by 2002:a05:6512:e85:b0:540:2a92:7dac with SMTP id 2adb3069b0e04-543e4beab07mr5018750e87.17.1738430962039; Sat, 01 Feb 2025 09:29:22 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307a3099ec4sm8852161fa.48.2025.02.01.09.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 09:29:20 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Feb 2025 19:29:11 +0200 Subject: [PATCH v2 5/6] arm64: dts: qcom: qcm2290: add UART3 device Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250201-rb1-bt-v2-5-fd44011749bb@linaro.org> References: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> In-Reply-To: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> To: Marcel Holtmann , Luiz Augusto von Dentz , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Balakrishna Godavarthi , Rocky Liao , Bjorn Andersson , Konrad Dybcio Cc: linux-bluetooth@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1323; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=qi1V0XhBkBrxty8uIfZTcLxNTnebQC4tHcL8urIKw8w=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnnlnljG1g1TKpDVTnvix/eIIEBcKypiNk+ZVnf /vbU1ejDriJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ55Z5QAKCRCLPIo+Aiko 1T8gB/0cdrpxkTHbi54eX2NzGCoWhVa+SSEGMCOLCnelL9wqbLz8NdVI9oM7ubwbisx5u9vKe1W DNP6kQ2CBVebRHm17Sx8xf2nIHTVmCfRLEHy/W+4yR08IK9j//zs9wsz6KVmG74ddF+BaucXVzy 9Gz2lCwUdg0F5liudBaZHaRwSdUaBqWECDbLG2cUUCdiHK0IjSHrxAeqK9zfQNAuQL515cj9/dW EF8Tr6C5XRzsQIdrC+ECstBDfjfn4QqVELcSv+igTHFzx2IiqE2wtU2mQJLx2OXhLuMjJn6w5Og /MPtYsDNC9Y2/LYUEkDYJvYBkL8p+tDMhvVvu4RGjXAt8MfV X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A On QCM2290-based devices the SE3 is used for the Bluetooth chips. Add corresponding device node. Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qc= om/qcm2290.dtsi index 6e3e57dd02612f3568f07f1e198028413f463c69..30e9bb6c1679aab13c3f3f7f645= 5f2483b2ba0c5 100644 --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi @@ -1239,6 +1239,21 @@ &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, status =3D "disabled"; }; =20 + uart3: serial@4a8c000 { + compatible =3D "qcom,geni-uart"; + reg =3D <0x0 0x04a8c000 0x0 0x4000>; + interrupts =3D ; + clocks =3D <&gcc GCC_QUPV3_WRAP0_S3_CLK>; + clock-names =3D "se"; + interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG + &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, + <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; + interconnect-names =3D "qup-core", + "qup-config"; + status =3D "disabled"; + }; + i2c4: i2c@4a90000 { compatible =3D "qcom,geni-i2c"; reg =3D <0x0 0x04a90000 0x0 0x4000>; --=20 2.39.5 From nobody Fri Dec 19 17:43:31 2025 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C6141EC004 for ; Sat, 1 Feb 2025 17:29:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430968; cv=none; b=lbJ+ZWQuN/XhVgBP5fyqH/Fxf77WaGCaDIxTshYJ8W7CcMWisvZLqAvyJUrVdHKmvMHXHgzPSEcv5EdP+gfVzp/9MyqtRC7dAuAF9Xt2GtpDcWnMFP9iyQHWyZjouqeasJFtay9HIUFG5a0193PvirzdF4sOty0qNs3ENU8bxZM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430968; c=relaxed/simple; bh=JNFb6Y/XdVHYoGkQV0QeQUNrQN1lFqLu5lpLIO5kuFE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IBnmo6yj/XPB/cI3yqNTD2l2Cy7c6PjKIEOYQL0k/eKdF8kHSGUL9pWt0xe1ZrbZ2h3sj/1advyH1pUNROmmOJkM25E0f5nkuvGvmYcShNN0a3YGToGiqM+/htHTkN2MUUtCToT5L8HUiNbZek5BCxkfxc9oGkZSolUqe4XRHvc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Xt3z897L; arc=none smtp.client-ip=209.85.208.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Xt3z897L" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-3072f8dc069so28036621fa.3 for ; Sat, 01 Feb 2025 09:29:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738430964; x=1739035764; darn=vger.kernel.org; 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=Ov3UCovqBDyElf7wgQMMIsdctTosh7cq25mLIhj+V3w=; b=Xt3z897LjaabPzY8ydXsVLPV9aAVS+Y0nYZJ+QvH5m76lupwowkUPjGDyxfIBGYX/k ppOH3UGPliwA5Th0WRsh4XGRo/0B2MFUJLib3TSEW58iUBZOkJINQkp1sVb8nJR7wJhR 0UdkoAnlUuEyAZGreovvP1nyzdOLGHp3oChvs2SneuLPXP6w0cf4q0Dlof11/dBRVQKS xixSTCc64M5l6revooqDe0HHS13SMV8hoTGSkns3MYivV+0Qj7EXzbm61ZvBVuMje/Ov fX547j+cCo7MA9cBjnR/NcmVRZRWt9FChxtofIoF6hVdaxQeu2TbIxkV7EUuyj6nAX/T sXdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738430964; x=1739035764; 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=Ov3UCovqBDyElf7wgQMMIsdctTosh7cq25mLIhj+V3w=; b=PG9p/RUEaPRL8sxR7MUKnujggwJvu+4rGDobHPqmJ9XTq3e7zeC3CtEfyNCIdE/56g vQcPPwVuhb4Jlq9lpz8EBOZWiS3FIpdQB3wK/JOcENibdP2TnRG5w/Zx/2naRqJFLOWS XoQAcINBJwx277tQDllDyv89UB6Sd8hfR7jLwobxDj5pL6XgALJPpFuJUSu2W0dLT3/B vQWTHlDZTKSCKtLzeHE6HrIES4QPUFzWZGkbcN4bMSnrm5wLhmDNJOSghmBj3R9mfFV4 XwV0KrC1ailwlrZnGKnLn7BiwZHDhPH2/FgOjq/dwSiHb63rAtzeCqZfFoX609AM8d/4 ctFw== X-Forwarded-Encrypted: i=1; AJvYcCXcctSEV7BSKpHMffFe4MshiGyziaVT/aSKDKb0Gcd5TMDH/3jTgcIxcoIaDFfHW4v+nxM6TvTdClrTn2Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yxqk/uiuCLGrO9Pd5L70tlfTH2UqSkW1TLPjftduLHKPziev0fQ iIaWl9KDJK1ro7tupR3lTZZUcmjSYt13CeK7P63gb/o2av5qcVz+I3+D7oDNIw0= X-Gm-Gg: ASbGncvYMfD22EFvYL/H/7rg0WuPoG6AxT8pCYBF1FOf30/bTpyLxBnOYJh/ZLUhql7 2qmCt87zIHPQXbgQFqscaIPx2ScibxMzm5S6Z0E+OVGwLRhywllgc6D8UfysdJw87L7zrrC5s7l 9msceN7AsLzQTnKELd+xJ16roJByiPNbqwFrpAnZJfGArxfEoTnfjzAx4eFD8KOCyzsKa3v7h1g nSpBKe2fi3VrBtkskl1saHuFzfmupdkd1XO9ZqUZ9OMPJ3AApdLT1dPZ4keX5zHBa3wouEpFa4h B1WgeIuWhEZVxCczANLNlq0= X-Google-Smtp-Source: AGHT+IEbRAFVDv4wTeAOfLKEfZhaMBcWT2J7LrursaaQv5WU+GnTo7mwskIzR3eETtUbLXdwcpyTng== X-Received: by 2002:a05:651c:198a:b0:302:48fd:6922 with SMTP id 38308e7fff4ca-30796975cb1mr53729091fa.37.1738430964458; Sat, 01 Feb 2025 09:29:24 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307a3099ec4sm8852161fa.48.2025.02.01.09.29.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 09:29:23 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Feb 2025 19:29:12 +0200 Subject: [PATCH v2 6/6] arm64: dts: qcom: qrb2210-rb1: add Bluetooth support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250201-rb1-bt-v2-6-fd44011749bb@linaro.org> References: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> In-Reply-To: <20250201-rb1-bt-v2-0-fd44011749bb@linaro.org> To: Marcel Holtmann , Luiz Augusto von Dentz , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Balakrishna Godavarthi , Rocky Liao , Bjorn Andersson , Konrad Dybcio Cc: linux-bluetooth@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3096; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=JNFb6Y/XdVHYoGkQV0QeQUNrQN1lFqLu5lpLIO5kuFE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnnlnl6CkypxUXZ9gNuva9FfZ1nAkgiRypC9/7h OQqeNg9FquJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ55Z5QAKCRCLPIo+Aiko 1TtvB/wKMPlfxck0+/eT+LF7golYJzAMWvXOVVT19yKb2FEW8oGVgxbEShBYDGikfO5MqXFER3q XYF5fiQK8uUQHWwdNnJRF9qxRvoPBxszSxhEOyI9sZicxSrT5vOyaajmlFTQd/+TkA/C8f1NVor w8U8CkPmtMLez1qcebKQ3D17MC2To/m7qFohl1jeJsmQBRs6z9T0PxpLwtlDgK0R0tjG+A7TmqH xAQTOVeXfKHY2/0a1/MHqQNgPiefsKUYF2GdgbJvOUkiwnk9dmn2b7V4e5ZUZnLur7nWuShRTLn SGbm9WWEpwtQUtwLltGcAOEcr8kgz/aCQk64pCVh6rm5L4Kj X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Add support for the onboard WCN3950 BT/WiFi chip. Corresponding firmware has been merged to linux-firmware and should be available in the next release. Bluetooth: hci0: setting up wcn399x Bluetooth: hci0: QCA Product ID :0x0000000f Bluetooth: hci0: QCA SOC Version :0x40070120 Bluetooth: hci0: QCA ROM Version :0x00000102 Bluetooth: hci0: QCA Patch Version:0x00000001 Bluetooth: hci0: QCA controller version 0x01200102 Bluetooth: hci0: QCA Downloading qca/cmbtfw12.tlv Bluetooth: hci0: QCA Downloading qca/cmnv12.bin Bluetooth: hci0: QCA setup on UART is completed Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 82 ++++++++++++++++++++++++++++= ++++ 1 file changed, 82 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts b/arch/arm64/boot/dts= /qcom/qrb2210-rb1.dts index 7a789b41c2f1887f0c41ae24da2e2fe8915ab13c..b9248505fadd3b986e188976435= b786f43975dc3 100644 --- a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts +++ b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts @@ -15,6 +15,7 @@ / { =20 aliases { serial0 =3D &uart4; + serial1 =3D &uart3; sdhc1 =3D &sdhc_1; sdhc2 =3D &sdhc_2; }; @@ -549,6 +550,66 @@ can@0 { }; =20 &tlmm { + uart3_default: uart3-default-state { + cts-pins { + pins =3D "gpio8"; + function =3D "qup3"; + drive-strength =3D <2>; + bias-bus-hold; + }; + + rts-pins { + pins =3D "gpio9"; + function =3D "qup3"; + drive-strength =3D <2>; + bias-disable; + }; + + tx-pins { + pins =3D "gpio10"; + function =3D "qup3"; + drive-strength =3D <2>; + bias-disable; + }; + + rx-pins { + pins =3D "gpio11"; + function =3D "qup3"; + drive-strength =3D <2>; + bias-pull-up; + }; + }; + + uart3_sleep: uart3-sleep-state { + cts-pins { + pins =3D "gpio8"; + function =3D "gpio"; + drive-strength =3D <2>; + bias-bus-hold; + }; + + rts-pins { + pins =3D "gpio9"; + function =3D "gpio"; + drive-strength =3D <2>; + bias-pull-down; + }; + + tx-pins { + pins =3D "gpio10"; + function =3D "gpio"; + drive-strength =3D <2>; + bias-pull-up; + }; + + rx-pins { + pins =3D "gpio11"; + function =3D "gpio"; + drive-strength =3D <2>; + bias-pull-up; + }; + }; + lt9611_rst_pin: lt9611-rst-state { pins =3D "gpio41"; function =3D "gpio"; @@ -584,6 +645,27 @@ key_volp_n: key-volp-n-state { }; }; =20 +&uart3 { + /delete-property/ interrupts; + interrupts-extended =3D <&intc GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>, + <&tlmm 11 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-0 =3D <&uart3_default>; + pinctrl-1 =3D <&uart3_sleep>; + pinctrl-names =3D "default", "sleep"; + status =3D "okay"; + + bluetooth { + compatible =3D "qcom,wcn3950-bt"; + + vddio-supply =3D <&pm4125_l15>; + vddxo-supply =3D <&pm4125_l13>; + vddrf-supply =3D <&pm4125_l10>; + vddch0-supply =3D <&pm4125_l22>; + enable-gpios =3D <&tlmm 87 GPIO_ACTIVE_HIGH>; + max-speed =3D <3200000>; + }; +}; + /* UART connected to the Micro-USB port via a FTDI chip */ &uart4 { compatible =3D "qcom,geni-debug-uart"; --=20 2.39.5