From patchwork Sat Feb 1 17:29:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 861315 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (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 922111CAA86 for ; Sat, 1 Feb 2025 17:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430959; cv=none; b=SLyFCZM7Lxjld5khlaFAzJahsy1+KFIiaVoORwvrNJFmi71NG6LtG1nWIZqbqZNdX3G7eQNMBXXj/Mi82TpRhbuW0vVPnKtpD9SVELh3d/D3/WF3pzhxoik03okMVnOvMUQjALSmb1K+kl87jICNr45jtf+Ru9U5hiDbFhe5sHw= 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.176 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-f176.google.com with SMTP id 38308e7fff4ca-30795988ebeso28041421fa.3 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=OJEtMDUsHfJWfm+w+Bug1xhQ82QeQtUHog41u6YKUtcEpRa5LR353BRaKtWjadOzI/ zc6lFA7hIpSoQjPWpRbarYYh3j5MV91FG0zQe8jWc4XSaIXELx2vimddR3kotNvVwwE3 zamI9NREoOmRmSqTe8kRlwHPEsnDKtoS91HSVcn8VJzhSCnfALS77XCSVfkXjgEIWswZ jNYVF/SAk6pD93RuS2bKgURGus1TXfzx4ht47otcLOROoR+QwqjZY0gUp/SCJqeDsBtp PkobKP7t1BpgZIaAjOUv4t/UAWxJk6Ude/wUFSBlefsfdoVkj2ghWxfmyLVfd8IE/cFs VnZg== X-Gm-Message-State: AOJu0YxPXmudSHX/pA2IRe6/1QOsRmKoR8xKYGC4tWAm2JpPN+BhvAtZ UYGr35pIvWdQ3vFfbpTZZNgLbpWxdh1Kujay7rl/mVZJwzJ1xAkTkylnxrpyhpeO+p4/xX7ukpo hUVaZ7g== X-Gm-Gg: ASbGncum8405AIPOYEDyuMqcOBDUSfHmxuE/2gFn+3sV/kt6vKErnDgwZzMLMbdn2xg xva4HjArctiLApfpXFynqNQIRV25XG4Iz6R7qxSjq7Ybtha4y0dBL5Keie5+sh4VDK7ilORu7Dl FvTfqa+x8Ulq6GlpF+UJm0TdWFx+SeUy0og8bhs3N5ZY7Td6knWwGq8bDmLXaOJFIUORHCqYAM/ C2vKj7fzcsvzR4I8hNj7sOtXo713wNwJrRwt62OZTFe+91AGIZy/TY2czxpLXO8VOeCptm+o+Ld cGtq+www/EMh+HcFcb4nU94= 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-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-bluetooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml index a72152f7e29b490003114dae1e36df85cba384df..6353a336f382e4dd689d1f50a624079aa83b2ffa 100644 --- a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml +++ b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml @@ -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 From patchwork Sat Feb 1 17:29:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 861453 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 8A3D11CACF7 for ; Sat, 1 Feb 2025 17:29:17 +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=1738430959; cv=none; b=cM++6qr8UE48/dQ54yQR6m8mUw10+jf+GPPcllt+iVjoTSUE6TgDMS4xoSeq0fsCkfoePDiNFCSzdeY42JvLnNsfcUNsdL9/cqQYS+A47nIbEDl/nnI6IPjG8wUpNVBTgy7kkkVYC8krkCjJWJse9Izn2J3m9Rf4N6UUJTzQAxA= 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.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="KfHwvFmB" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-30615661f98so32636581fa.2 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=VsPadgwgeR3j7kDfeByLdecCA2tPAaUeOlyIWNR63Q8FypXiqkwu54ChvP8TcWuoU2 PHoEevIE6vMgPyXw+T4cUINIU52djiqNxTYl0twjfoNIb+VKPb3LgzeduA8xOqm1I+jP k5lUUAMVMdNUL/fJqQo/nhM5GtWBbLl5lWSfkRBb+d0QXBG/Yg1hzimnSHLCusBVKgnn WL8AbpGDVxaS67zRq/MrdT0MhnoRrwp0aXBK2romhfqdI5zIjxNjohrtmSCxj02d6IvC DupwsuPA4V5PDlJNfHEI961wcfOGpAJt/6IdiP4CHE5kkCpLVJzs9AmSNT5HspU7ON2/ 7YDA== X-Gm-Message-State: AOJu0YyA/kUh1RbYtuHoRy4qGG9iV11OcICGroVq7oL/tdlyC7aoBngZ ssHT92h+8x3v6gUxtkshYn6ONhrH2piSp85WNG4yOAPndF9UyRSTCD+JJHyewAM= X-Gm-Gg: ASbGncv2OYgNDTx9Fj4Gegs6d1ppNZ68wvRJ3hgfuS0mkqpoUClVjX8iY1ndUJgV7tg 58IPcdzQ/QcCk2P6C6G9pBibqVVgMTs25K6XqmOZ55FGKUI1gGdEvGRZXMdqitDzBgmTHE+Vbka tOzxiN6rhOamd6MMjv17sIR8pEjBvncA+Gv5uyTl9+LNVsftG31va4nj+bpVt4wqTt4IJD6lNSj YXx1SOniQLxw2uBXGdSzqs8x+sRrDqQLoeyJAWoM1L8g96jgMPLK35L1JCYC6ve9yA8dSgN/kEH lQC7xS+/1ObreebDdfsKO4o= 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-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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..7d6b02fe2040ff16d9d62de683571e1e1900fe85 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 baudrate, const char *firmware_name, const char *rampatch_name) { struct qca_fw_config config = {}; + const char *variant = ""; int err; u8 rom_ver = 0; u32 soc_ver; @@ -883,13 +884,11 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, case QCA_WCN3990: case QCA_WCN3991: case QCA_WCN3998: - if (le32_to_cpu(ver.soc_id) == 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) == QCA_WCN3991_SOC_ID) + variant = "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), From patchwork Sat Feb 1 17:29:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 861452 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (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 372041CDFBC for ; Sat, 1 Feb 2025 17:29:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430962; cv=none; b=B/gALUVZDd6avhf864Vp4e/vRAxHBPX+EQ+rFBd8Beax7dtuQk7Num5iOuwCKAdalki1Mx9Sy0aOJTa9jIfA7le//jUhWUGG7u4IZWGupfzofyRZxUNkihPOVqUak/8N9k/aU70YUI+3+qkv5CWLNoSPhxqi8Is1Rt4AgjiLKgc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430962; c=relaxed/simple; bh=ycOIHYAGFDD1jOlWhLjzqCD5G1p8AhMZpp9cNcyiiKE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Thez2PAkImGR5g8tCBd7EnQ04ZWWPMUMxmrsKrt7lGuikzGTEtULVGZq3+onQn9iD+V1bqghxe25TqM53+1uhvAYU1s8hYW2Ed9gAttEICaNuJ7S9veUGdn5dtrz/zTQZVHvSPp8TDjdzpIh8JkJ6NjgZGeN2xXrKKjHIfF0UJQ= 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.180 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-f180.google.com with SMTP id 38308e7fff4ca-30167f4c1e3so28055761fa.3 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=nZ3wPx955TklVFmMJYzjgVMtTCrfaccqDc4La99He50Sxj9Q3I1r0mZn/u0Q21XaBe Ev1k1T1chbjQnCcuyr+8vE7eo3trP6myr/01/O50so68q9VlCJaT2Ri/PgAdcHwTv6Nb fdo9fHaqZHPxDP/6zfCA3Neku5u1u16EG9xsx7kxidBU7DbdQL7PvEH3CHGk9WMBdUPT CYrNw5iVgAsaZSVnzZwwTQvgMm7Skz+SMfbXtUVftNjzWw3RafjCubIFFWhec/VLGvXk hW5k0m4QMEGeTLysbNOzMYIbt5fI0Z4PTLRkS1NRU1rNuEHwvjg70RC5F2ClNgXnobKQ qTyQ== X-Gm-Message-State: AOJu0YyqqtIXCKW5B8X20MwLkp17ULBRCebOvk2TK3Mp9bij8p4HIt2R wNKKB71CdHNR8TENyV9rA0uHftVdYO96n0HVl1dmtJi1yIxGVOZ6xnSBxaHywqg= X-Gm-Gg: ASbGncugM7SdOdHKcmjScPiOMBydPs47TA9DNNZvrmp52tiOgERt7KpfjFC0cG+LuIP lezVTBbZENH7MsgSCOs6lQH2vZ8o5BbRJEU21Xr/P9ljUERILiIERJ5q03iCP5U2PiU5iLg6Igc NbABNdWJrEvkwPQYH7UZeQux1UdmhJg9FC9jOOhV3cJp2f2IelWIUdocXsIhCV+cspD3r22Gyyj APB7isE+XqwUI4AF0XfeVIJz3EyIVoZB7dSyvGtKNkY/eWNnmeY9q4EREFw/PeFAQPVx9MGjQ/K 9GIwC2XwrQG2SKQg4HQICy4= 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-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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..3d6778b95e0058beda3f0500b21caaef8e797d32 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 baudrate, 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 baudrate, } } else { switch (soc_type) { + case QCA_WCN3950: + if (le32_to_cpu(ver.soc_id) == QCA_WCN3950_SOC_ID_T) + variant = "t"; + else if (le32_to_cpu(ver.soc_id) == QCA_WCN3950_SOC_ID_S) + variant = "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 baudrate, * 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..8f3c1b1c77b3de8e7c86578aa3af17aefe99dab3 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -41,6 +41,9 @@ #define QCA_WCN3991_SOC_ID 0x40014320 +#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 = -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..b39889ce0e8ff9d97f72eb8e70cb9c6825984c82 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 = serdev_device_get_drvdata(hu->serdev); 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, uint8_t baudrate) /* 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 qca_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 qca_speed_type speed_type) 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) } 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); 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; 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 = "qca2066"; break; + 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); 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) } 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 = { .dequeue = qca_dequeue, }; +static const struct qca_device_data qca_soc_data_wcn3950 __maybe_unused = { + .soc_type = QCA_WCN3950, + .vregs = (struct qca_vreg []) { + { "vddio", 15000 }, + { "vddxo", 60000 }, + { "vddrf", 155000 }, + { "vddch0", 585000 }, + }, + .num_vregs = 4, +}; + static const struct qca_device_data qca_soc_data_wcn3988 __maybe_unused = { .soc_type = QCA_WCN3988, .vregs = (struct qca_vreg []) { @@ -2338,6 +2360,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) qcadev->btsoc_type = QCA_ROME; 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 *serdev) 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_match[] = { { .compatible = "qcom,qca6174-bt" }, { .compatible = "qcom,qca6390-bt", .data = &qca_soc_data_qca6390}, { .compatible = "qcom,qca9377-bt" }, + { .compatible = "qcom,wcn3950-bt", .data = &qca_soc_data_wcn3950}, { .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}, From patchwork Sat Feb 1 17:29:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 861314 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (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 85DC51D049D for ; Sat, 1 Feb 2025 17:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430963; cv=none; b=SPFBT0L43ikXGctiHzfCNOGBdPGlu+4c2WUcA2l/+1v0Sj2mRZuMkLOHCT2SuIgovlkUa41DRXZM31dcvl7ETM3VKLYdEoak2yb7lQJgfkVfeD/CI68dCmCCBJ0lJSg0AuI8BWP8G3+guleSp7Ib5tcNIj/Vi6W5Pi0oWlzWfaY= 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.44 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-f44.google.com with SMTP id 2adb3069b0e04-540218726d5so2862720e87.2 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=rOYCdatOWVYKTEYjfj/KiruVpf0jRClg5VZnag3ujzaLdTe1M/ADuHt4LWhg8Rs7lK y0uwe7z/aAaB+Z3KVzoqmbSLzfliskaJPJcKD5wkX4QRelU35PbdHusZ8VlOEYwVTyGs tedVprk3GkGnmQriIV6IknFGkReUmeR948PYXmOaBx3Xlh7U9QdoGAt/8dwircX+KImy 6j5W3SCNmGQvO8WQWcJyMcAsL3OWmQ0tX36h0mu5vmtfY3iZ1sDqcD6HfQjblJoZzw4T LH6fSmP9SLdABKK1iCXUYj4U6jCyhqDxD5Y6PmH0O0wLhy3LywbNTPFwagrhFzTbGtDW o/Fg== X-Gm-Message-State: AOJu0YwPR9LSBzPxFg7Dlv3MPIZtYniTpcT+49ZUZnuDpDQpUyHH3PNd Vi5YA4S+gKhy/avisqtvQic8QR0IaYO2JlSymvt8ZJrCI9RnhnDgVPCjNy4Qfx8= X-Gm-Gg: ASbGnct8a55rdn2YMUMjA5ekR7whfQfeXtuPPDi/mFgubczGuiIcjWJczBIIGms3FnD +UHQcLyLTeaTkSJ+NHaRzFn9EWBxFjqrCCFybVwFeXCLBt15bcJMBtSpQxY/aRbnssxSiFrHv3l c6A6Q2U1GzbaUgS1dHb4tUt8eyyHF4EVg+ER56w9/jiJ1FrBB/lMuWclyg95tsuW9NibejiHV8i GiroQOwHFEL/74ltYomfKPoPENvFx8YrlZv8pxFct5RJozJTDb5J1+nDDmjFGr1bklwBAWll3PV 5ForRmJcMyVbn3Iilzw+tvk= 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-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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/qcom/qcm2290.dtsi index f0746123e594d5ce5cc314c956eaca11556a9211..6e3e57dd02612f3568f07f1e198028413f463c69 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 = <&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 = "qup-core", "qup-config"; #address-cells = <1>; @@ -1092,7 +1092,7 @@ uart0: serial@4a80000 { interconnects = <&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 = "qup-core", "qup-config"; status = "disabled"; @@ -1137,7 +1137,7 @@ spi1: spi@4a84000 { interconnects = <&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 = "qup-core", "qup-config"; #address-cells = <1>; @@ -1184,7 +1184,7 @@ spi2: spi@4a88000 { interconnects = <&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 = "qup-core", "qup-config"; #address-cells = <1>; @@ -1231,7 +1231,7 @@ spi3: spi@4a8c000 { interconnects = <&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 = "qup-core", "qup-config"; #address-cells = <1>; @@ -1278,7 +1278,7 @@ spi4: spi@4a90000 { interconnects = <&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 = "qup-core", "qup-config"; #address-cells = <1>; @@ -1297,7 +1297,7 @@ uart4: serial@4a90000 { interconnects = <&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 = "qup-core", "qup-config"; status = "disabled"; @@ -1342,7 +1342,7 @@ spi5: spi@4a94000 { interconnects = <&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 = "qup-core", "qup-config"; #address-cells = <1>; From patchwork Sat Feb 1 17:29:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 861451 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 E74391D618C for ; Sat, 1 Feb 2025 17:29:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430965; cv=none; b=G4/wjluDd3T3NB27Y/HxsUlo58bluTJRLaYndTsuJlls8L+usCUt1EN8QL2mc1uhfv/Jobnw4WVwgD6Wt4vQA0Y/s8QM94/D1mb7U6PIx6RN1SNCp/GgkPBU1BCwCNBBnNLjcpxj5UQNxTBl+tC6AXXOwXx4hSDyPYHpUxtGFe0= 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.41 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-f41.google.com with SMTP id 2adb3069b0e04-540218726d5so2862738e87.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=EXOFOqH1cwLWh0TgefOEcMaXaca47xyZGcC8GNwtP9e7sIb5aOKiheUpCGo6/Feh9B TLMcmDmJevH6fIB8a8xLseqZE1qQoyCWM3gMuqgGyxQQd7iEM/CjudkK7N8Eqm0OLk0r Dr0RtTLWr5Cdp9tW7mD384VkhuP+LtK5FLleu27XV+pRODKpsi3Pp867QzW2kbQRQg43 zM16GF6PUfHRDYIYt13RwZ3XQ5G9JgwrQSBdWj5VL9F85cp3PyAr6YlpaFp91he38sdr mhMXbFCQ5dh6ZiK/TxXRPN+nE1xtLJYVO4GAdeE7kwnNnPvN7rfkXKlPquxd99jgdGzq 9FkA== X-Gm-Message-State: AOJu0Yx24z7Fx05zHe5LyrcpL/R7p7x6sIw3jQ16Lt/ula0BPuuk2bH1 GrqwVTOyMWSXtSxAfv2cUndzwlnep/QdDBgf8JTtRO2kJ6dhLCShfFy4z/8/LYc= X-Gm-Gg: ASbGncvXenLNu1EObY+qvn6WJ5yMkqogHUEhvvUrNp1faH4lbVSiX66BaprGkXL/q4t nHoxVx+dI2oeBXAXUzJ0r+8CoJAFhBBOcbjuigXUfoe7RZC7t6aDs550FJiam9lvlrl1bEr4aK1 LixUfUCvUBwytHUQp7LjnfkQ8tbkfKf80Mg5Znc5d1K6c0XiDHn89gV29i+Uw/tv5lKjhC0+Alw 0DKMyJ5KMOKbJ82CrNNNr56j1EScJj3gaCRihhAYxqqBdi9yJoEbYJJfMEu+nLvGq2mtN+t9JQj pqiuJA4CeOzsz9ms1iDHCF4= 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-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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/qcom/qcm2290.dtsi index 6e3e57dd02612f3568f07f1e198028413f463c69..30e9bb6c1679aab13c3f3f7f6455f2483b2ba0c5 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 = "disabled"; }; + uart3: serial@4a8c000 { + compatible = "qcom,geni-uart"; + reg = <0x0 0x04a8c000 0x0 0x4000>; + interrupts = ; + clocks = <&gcc GCC_QUPV3_WRAP0_S3_CLK>; + clock-names = "se"; + interconnects = <&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 = "qup-core", + "qup-config"; + status = "disabled"; + }; + i2c4: i2c@4a90000 { compatible = "qcom,geni-i2c"; reg = <0x0 0x04a90000 0x0 0x4000>; From patchwork Sat Feb 1 17:29:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 861313 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (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 7825B1EE7C1 for ; Sat, 1 Feb 2025 17:29:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738430968; cv=none; b=FGQNmm/CanQdZDrIhNID7rI8BTa2BbKTIPcOOEcaKgN96Y2G5vt1WPp2b8jAIyryC1UZmAskOQStSEc2whLBHjBr2l+4Jxluyvt3hq8wSj4D3YgUBYu9erokLfM2g2V4KfAE/7jWdVl9MUVKjlSXFNckScOxZOtbM33nyxITSMA= 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.174 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-f174.google.com with SMTP id 38308e7fff4ca-3072f8dc069so28036631fa.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=GQbXpclixvFO+jb27GwCRlO6vMBTVeQfGVyexaIDMGGfCh9wbqoib/jqWyWuMAkv3f +11Z4DelZi0tgOM3dsM2Qs1UxWOAh4m7BzlPscwBrG7ywoC+k7aj3sNMcYvx1sp/horP gAgd9WaPubLYE+EEJHbImTafnVx4hnxoKMqgX83kKQmma2ymt9YKPiL53MKSJi5ZZG3d y4hxv4JMJ9W7AnWswdvjpMsSWsDPs4e5V9m5TWyWk3qS6Iw2dy5T9aSJ74KoKAHW4PNb hY2AAr06TyrJBE2pbWoKpTbTeUvWkqkoZXXDmrw/dSYDL35xjOG/o6YiiAO4TbW0QWJL 4Qaw== X-Gm-Message-State: AOJu0YxWIIi3f91xGciu4+3SCYGITNnRWsby8ip2LHKPROmJQW+A1MzS bex/8SBZh+acIYOBFqjbXa3M8OP17Wl/mSHmJ3gCyKUFVtaPhACjmNT0K8pBLr8= X-Gm-Gg: ASbGncsCa+Dg8MI5RXpUlkLdGmtGlBQDgieobavs0B0PWzMwP8Zdu5PLrwylE6/A6nB 2j7cUDp4FdBNfF4vHsiQ1YHtOrACdTe5vKyNQffQE+68m0VULU6HAlOOBxXPVAM2aJQdCkbOS2T Gw45DaJKYrchli4q4j8cB+smGISEO0hYmBu3Xj2AgG/SG8q2Y41occFEyja8ossei1V8Io1K5ga doHrHwwvL7orDekGi3mNonlGrKpDwdCBBN4SMOYdJREk23rpKanZ/kpidlVO8k5obmYsIh/9ZsC o+GHkCw8AdaYrrJTDph5m04= 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-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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..b9248505fadd3b986e188976435b786f43975dc3 100644 --- a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts +++ b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts @@ -15,6 +15,7 @@ / { aliases { serial0 = &uart4; + serial1 = &uart3; sdhc1 = &sdhc_1; sdhc2 = &sdhc_2; }; @@ -549,6 +550,66 @@ can@0 { }; &tlmm { + uart3_default: uart3-default-state { + cts-pins { + pins = "gpio8"; + function = "qup3"; + drive-strength = <2>; + bias-bus-hold; + }; + + rts-pins { + pins = "gpio9"; + function = "qup3"; + drive-strength = <2>; + bias-disable; + }; + + tx-pins { + pins = "gpio10"; + function = "qup3"; + drive-strength = <2>; + bias-disable; + }; + + rx-pins { + pins = "gpio11"; + function = "qup3"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + uart3_sleep: uart3-sleep-state { + cts-pins { + pins = "gpio8"; + function = "gpio"; + drive-strength = <2>; + bias-bus-hold; + }; + + rts-pins { + pins = "gpio9"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + + tx-pins { + pins = "gpio10"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + + rx-pins { + pins = "gpio11"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + lt9611_rst_pin: lt9611-rst-state { pins = "gpio41"; function = "gpio"; @@ -584,6 +645,27 @@ key_volp_n: key-volp-n-state { }; }; +&uart3 { + /delete-property/ interrupts; + interrupts-extended = <&intc GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>, + <&tlmm 11 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-0 = <&uart3_default>; + pinctrl-1 = <&uart3_sleep>; + pinctrl-names = "default", "sleep"; + status = "okay"; + + bluetooth { + compatible = "qcom,wcn3950-bt"; + + vddio-supply = <&pm4125_l15>; + vddxo-supply = <&pm4125_l13>; + vddrf-supply = <&pm4125_l10>; + vddch0-supply = <&pm4125_l22>; + enable-gpios = <&tlmm 87 GPIO_ACTIVE_HIGH>; + max-speed = <3200000>; + }; +}; + /* UART connected to the Micro-USB port via a FTDI chip */ &uart4 { compatible = "qcom,geni-debug-uart";