From nobody Mon Feb 9 04:45:51 2026 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 083251D7989 for ; Sun, 2 Feb 2025 12:16:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498570; cv=none; b=FD48QVsDWT1b1iLqu453VLEwAOhau3Pti+GIHwTpoHADJPzQK9TvpoMsBpxk9BxZOh5U32kN3Kb7NS+/g3lu924q5GpJSn4w0QhUOOF/etlqfhRS2QzNE+v6SOe/FbKw3qub0j+2ta2din05KjK0yl57eVJcRWIAhxN+V4ugjb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498570; c=relaxed/simple; bh=/d/geU3OxC4Nkibrq9A3Ew2gwBiXmZo2CHTH+6Gy0Vc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jX9XuLuSrHkSGqUuNHEuJrq2OWXqqmJBSnFAAnNOX1uCSdAXr7xi4PmKSWrl+zjGnKt8vHpIcv5cipIcBDc7hdb4d5BQ7ic2IGpIUmWItNSqBMiavTu2Ljfd5emZxrCB/RM+Uo/+5VWWKonjAAkLbQoqIVvmq0YUxodIsy8JSvk= 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=JL4GkBxB; arc=none smtp.client-ip=209.85.167.50 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="JL4GkBxB" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-5401e6efffcso3649071e87.3 for ; Sun, 02 Feb 2025 04:16:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738498566; x=1739103366; 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=JL4GkBxBbSlI0/wHjLKBhSuaSJ7t9Q5DiBXxkc2u7JVhuPzfIJmz+/8PyI8M9iPwmw mONIP0VSf14x83Fa0R+DdYEtJjFgaXA79df7H4YznQbYSNhFy6QUBzVNQ/GWuIdMBJjy Lbly12zucWNvw46adQ8K1j8i/GgK+It/NmHP53rNrno1VwHFbynshx5hmUq8ejmzTj9v F1qVnuLWZCEcU2LyXAJWgIb3DEHNPwNNHt/nWF3NCNyEyeWwKV1whoMLY8Do+16UBgIA GYrj/9yRNeX52FeeXe3/Pu9f6c4BLj2cJvmoD/VD1wXTHToADggvtH4uMBOMkDlrqeUf EukA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738498566; x=1739103366; 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=p6veRZSVH0R9GQh4C8tLqUZp6nBmdcEu09CYs/9BQ6pLhTDBtzOIkBqPEuieaYrjRH WwieJIsQpEN+CacwjTApDgerQX+mkW5Tm0R8WgBXIM676w/paRJ7H6itJL6qb5IVKVRv 6rrsDxRNCLhrnft4+NJh57uUG6IUhaMWIuZMiEbIMppyZIPd565RWMTeRauMwQZdB9BI K/abLffYRvFXzBmaJbzuom69mz4QKM+pqXUaf0CyPaexSfJua8zEWHbdEB+ebnUrqPn4 54E6CkfqDxBIa5AqVtjD8cMpr/lzr+f7I3Fwh4eDcXy7rBounaa046g+2WNHLAawwzK8 kyQQ== X-Forwarded-Encrypted: i=1; AJvYcCXuLcpGpA1NS6dnceq5CcuYAuM+9DCI3sH0Y9rACMDDYL1MGPH8rYiaIflooQpmOi7kLyWOPbD21oYsHv8=@vger.kernel.org X-Gm-Message-State: AOJu0YwV4IZliaC5OUs/rJehXomJQ9BdGkds+oNoHbioriN3R385yCdY un1zFxYGEogPRN+fLsbU2WMPRCFgSMy7sWN1xN2wVoQaDBzzGPJ+lihBj+HGXVw= X-Gm-Gg: ASbGncu2fVcTa7ehnPmvqPw8Sk2H9QZ8MVu0h8NiILNED6yCc7TOxpi/hN5Vro3diLZ h+2ugL/Y1Kt0v5jCSq6M6TPKPTtsG5aYmRjpdGEeS5/JqVEWLbbihKcIiiOWvIbMm/M9n0gGGtr qL3QKdPel19tisS4tm7geyW2rUNrkpZgNqpPBtIPkIRqlJ1r34Dn7LfyDFll5D4jzN3Iiym+Fiv l7wwZGylduch7/mXk7sJTzpSJ3QkaONqL/U4TxAHeiig5oMtMaYK1LC6qOWCWTYj6LJj5/T0Xw/ 8EcvLWrOcRsKpTlVe36Qolk= X-Google-Smtp-Source: AGHT+IGP98WumGAvva+L5oENy7ZtjMAo+pqO/eBrk6bMfEKIlWE1R/0IRGd/QpefZzWafsWgZy/y2w== X-Received: by 2002:a05:6512:32c3:b0:541:1c49:26a with SMTP id 2adb3069b0e04-543e4c41038mr6109076e87.43.1738498566072; Sun, 02 Feb 2025 04:16:06 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543ebeb0a4esm950663e87.114.2025.02.02.04.16.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 04:16:04 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 02 Feb 2025 14:15:57 +0200 Subject: [PATCH v3 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: <20250202-rb1-bt-v3-1-6797a4467ced@linaro.org> References: <20250202-rb1-bt-v3-0-6797a4467ced@linaro.org> In-Reply-To: <20250202-rb1-bt-v3-0-6797a4467ced@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/pANAwAKAYs8ij4CKSjVAcsmYgBnn2IBFNJQoyc6Q4TD+Kypa+h8oMgJ1mr88BTN7 iUCRw7nItiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ59iAQAKCRCLPIo+Aiko 1dQvCACSiRQJBXKmOxljdACfeKHT2m75Y5VpbZRWKMkcI4H0buAMvopgfIgG9wPFTf/dek+VG6p lqKqBfxIV+KU99Dcb7wxL0JW5UBsMx23ADuVZLjUmdCSJq+tSakpNlbdkmaeXyV/PNUD/ULwhyZ MGX56kw39F9vBS3TgKHbv7ncPOqS1mNm006aKml/MWzxKqFLXt6mlofqI7V/K82io+gfHeSK9am Rnln3hHL6poko2ReUQcMCvpYBAcF7RmwaYk9th1OWVNRCsz9QpGgjdzztVW0T5JFUbjNWxd5VvI hen+Oa3myvAKVNmTcGGAZt6U1MMoI4lAB/6hVDsISJPP0Mgz 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 Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml | = 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-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 Mon Feb 9 04:45:51 2026 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 3D2281D86ED for ; Sun, 2 Feb 2025 12:16:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498572; cv=none; b=lxDocN5h4iGkuny177MFxQGQSCMcDpD1dyHZg4pe/MGW2e1AekATKsJSaeVaFAddOQAZI7yDBrtfrrzqxyBsXRTjLCgachfoNGWScrTwBS+Rk+vwnrURHhLSJgROgL34NH6q/lKkFAjpcfXUkaoR6OWLwYy5HzAW3xXKjUwWYVQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498572; c=relaxed/simple; bh=XL7ng8U88IdS02LpqkHkwAED27Q7ZWUI6j1I8zn2UOs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Fel95y+6ajewCIGepu7Ln3yHkIUCfawJ27issrxK9SWlov8uPT+iSXnNvzHvlUc/LHE0NSQ+dAYUp1uwvIiTQPYI/hV31GTG7589pTNvwJj5JJShkAWDppx5C8zdOZ5ZRHeND6ihV0TZMPlcaWAtRj+8DOprHtd/fIT4mZJ7X68= 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=yi4uvw1h; arc=none smtp.client-ip=209.85.167.47 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="yi4uvw1h" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-53e3a227b82so3089733e87.0 for ; Sun, 02 Feb 2025 04:16:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738498568; x=1739103368; 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=yi4uvw1hfcswZ2VQxp3nDkBa55RPmjGgBYmwe+CA+jXBHXVVMdlbB/zKmnI8qd5Yqf gJuglgJbb9RGXJmeutypPMJ2/DhI89YmWj3cm25dA0UdudeLUEU+LMz/6xUCTRNOynqs 9MAAW7LrziYzckbGCdFONcpTDNLb2GjjQcfyJKsfRud3CuUS1dM10DuJKFgSz7X48Eiw JW9n10g57JucPHyBQQFugKeuGv8kGAW2falBzNMprDEFSO/OWSC/VpiSk+WQllJIHuKx 7ro3YmL3hYuFnAYr1ZdzfxcJ9Iyy+5y2V3+AdhGZ9/daqpBdW5Ll/h2DN1aDlrneqSzt /MHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738498568; x=1739103368; 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=k5fiCETwru7DDeB/MNRCtEt/dJO+REFu+abIF5riyLPj6ZM4x/eHGsra67hrNuxHN/ LEwfWtwV0BGHlRIIBghbH9tpyG6Gy5fnjNS3W15rGETY9/BRcE0yGkuT16jK0W/ougdz ZZs1JUViYiJc6Rdsme1Oh05ZIEneV+jAQcRQMXnGWcr+0zW6T7Q0YnLkhg74NZCClq3r 2yOfFToEY2nEd/8WHgRhyTPm3yUZzfb/I4AouocKAKLQJcmG4qsAJiPCNs3AnEpj5tsv tm+3GMc1KVbIf3DNLqubEOt5ZL6VGknp/SO87+46Sp1hsrfPls1aSu8ac4r9cVadr8z3 0Gxg== X-Forwarded-Encrypted: i=1; AJvYcCXmn0JtVWQYblST1hOT2TnjCc1SF16ylU6+ApA+2mDdRtfqvlD+gCSC3/NMkoyfJZpToJHFLf3l8MSend4=@vger.kernel.org X-Gm-Message-State: AOJu0YzhuunAYFBUtC3fPeB4tpgYz+M6/PLO9xYeO3EY4Gf0IrQ3Ue/h IDGSSlLYiWktiwcsn6XuCbgFb0SCHBXBmiKofR+sxJMLrn9tgtAYlomSXZ6VOwQ= X-Gm-Gg: ASbGncvwySUdW+ljl8N6/K8DxWJdEJYjJOv+ZKhODaOp4zsQIj/4inHNOesy26agUM1 Uxo+Q4HPg6+N1+n4QkDbrGrBTL0yihxuar9ndUOpKF01mbhN/vAPZtqCXlHGgXV8j3kj0f5u9gH 0ymuJttvsXLt5rcPukJdgPDN03yd/1G/QRRW7rzxHoNKmR2gPu2WOEFk34em3F1e0OQ/Dac7T4V 055mcO8SnOACuqa4jmIe89j1bf1aHYV3uxnoZwb3EUr/GyaHFILZ8L/RSzDHSYeCLRjNZpDnT+L LKu1wvMtzRJGyIFKmYeSC9I= X-Google-Smtp-Source: AGHT+IGkAqb29ObwLsStliQ3X+p82fx7N71ujUtJWUx9Mh0vkbbBSuYVWVgq/RcqBea9q4sf1SX4og== X-Received: by 2002:a05:6512:2344:b0:540:20eb:80c5 with SMTP id 2adb3069b0e04-543e4c2565fmr6341236e87.37.1738498568556; Sun, 02 Feb 2025 04:16:08 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543ebeb0a4esm950663e87.114.2025.02.02.04.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 04:16:07 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 02 Feb 2025 14:15:58 +0200 Subject: [PATCH v3 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: <20250202-rb1-bt-v3-2-6797a4467ced@linaro.org> References: <20250202-rb1-bt-v3-0-6797a4467ced@linaro.org> In-Reply-To: <20250202-rb1-bt-v3-0-6797a4467ced@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/pANAwAKAYs8ij4CKSjVAcsmYgBnn2IBLOuD4AebbL9VEvX8M3u7zFk8VAl9gGNdQ alwF5QoryyJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ59iAQAKCRCLPIo+Aiko 1c7XB/9loxRdO1eIDrFUhixVzmgXgsB59i1s7L7w88DJXzg+vTbZ7lC5QDBnyZP6T+XNLr3SZ/0 qA+mMVM1Gu36R1ereCfMUgQCm3kfd+KCkYq1lQCjew5UxQC19mSU6UXmRQ+9QaY3iK63cgaf1ua PahJOxwqmNyGBi8BilFp6nLftFFiLLQzGorraEs2Lum8LOd18X1sPV6fv66Fhbp2xuFa5WsHZbd wJujrE8PgFeOnjtxYLt8crEUMwl0y1/b2ULnMKZ8rmfpwW/scXcH8HJ0PnTZFRNp6vEWmKYQHk7 0RBh2sM7fMqwb3wWlJVJ5f0EgRDT6DLHmaiCgGZi74ajIrv4 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 Mon Feb 9 04:45:51 2026 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 54BA21D8E1D for ; Sun, 2 Feb 2025 12:16:12 +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=1738498575; cv=none; b=PC8h8l3xGM3FtLMpKD7jOJRmACjdwYPp43uOxripDlKVbrguR7wSjfOb/zH7gBjIZf8jKe1ijk3ABRJ/xW+NIPVEWHVPe5CsmBSLgqZD+0NNY/OLMvGu14kgrbzbNyJ8s6xA42lmOr/WCjdWxP6To8tuBaVm5qXz6iqXg1BLvKA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498575; c=relaxed/simple; bh=14MmxgXH6MGoKQlSv53fBwYT+gb2hGBEOWXu2liSlgE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=prukuNDaBaS8LTtpRUVsGOOFJFcMtjQaUl0PCqIaHSAFmN+8fQ3c59rx8ohM1arpOiA4WprMEhHU3gB/TU9nRUeZhBVe+/yc+QWp/XZiFhw32gw+nJTQE63mInAuftdSfcXIt5poycejuTKCnZsxz63FLXA1eDdvovlJVMa2Zx4= 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=jdZNMxdj; 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="jdZNMxdj" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-54021daa6cbso3704934e87.0 for ; Sun, 02 Feb 2025 04:16:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738498570; x=1739103370; 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=5/wgQA4ZO4Ux39DmgobxmQyBbaP59b/Ddx14+zk9ePA=; b=jdZNMxdjvLm+PitNsN2jOkjSoDVNrrWHABWcTsD9dhwQdzIvOeitEZ63NE58pmEoSG +3fQR6HiITjqxBG4Q59R2Oy3mE+R6He37XT+DCtSgi0t7chDdh9fUoUl7v4EOtJFLR0J 6y7Y0irEkmfA9P6nTkyQDBRogCRPAWtBPGffQ/RvkPxL7AImPDc2nOXn6tEzhuV+q1n5 brrm9hl0E6/y4lfrOy7d/yAahrNlsKunbiG5eB6gm7o/lT6UXalBO45tVg7DW69/0dPh hIFlSqxHtgCtUugAaPkHjplP/qcVqQBgV5Bao1rT16u2Pn0BWLdBlGvCZOOqBaDSio+9 RJKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738498570; x=1739103370; 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=5/wgQA4ZO4Ux39DmgobxmQyBbaP59b/Ddx14+zk9ePA=; b=O5u3prI4r8HVqMjO+fCZKRUEo401h33nrxgrLtcxLWw98zh/1D1sf0UDifO9FK0cxE EohLuWBAceXQ6Zlb5SygyZOoh3Sd59GjCqkj7iU8iySBq1WUiTesBub851G0g+7T015T 6Te3PzqFvXHoNDxEcFwM/SsL6wkWUzZH2EH+2oxUZD65m8DbVE06MvyzckX9Q9gdl+3N MP1HZiw59kJWh8q9Q1SVwxPTcN9HiqJb6lwRsh47EeuAzo5/p6Pedx0KPDigRPWDrcQO kf+vMvR7+kXxI7qk1CsVAMOjwKMQ66BexsveZeQ3ZPySgfS5vAxMwbuCd2RpRaKy6tPB wCMg== X-Forwarded-Encrypted: i=1; AJvYcCXjkvoIFpelZiV036IvfsF3wJ7x+hKQ++qGF0bMM8b6oFrHQE8cpJP0CzetVWiecjpsKvxO8qY82CVaJRo=@vger.kernel.org X-Gm-Message-State: AOJu0Ywz+l628mqI8HvWlvp3CpbhDS2yfEV5/qVoIXIpSgEmkXU5Fzha /1xG8t16h+u/4ICWsgENJI+ZKqEAszV7sD9quBs3qpJTlrhv5TFFVPqLHw6E4zI= X-Gm-Gg: ASbGncvcrVaTHXwN+6Il0J8xFO/HJQTX5S3y+VMuiqtnZ7OiW7Wpoxb25+cMEm4pJ1/ Eg1ccrbOnkTJ5/fXOCHshNoq7T+YZwVhTX8OgmYX6wRAOW7NWEzL0vRy5VetJryebDpJ8gMhZwN D6qqnEWwqPkpv+ze1uX4OtuuRkCgKIYGapes4yoVRHlDv/ILldCWIPx4odkxZjMYsLJNQ95ojXk iPzAvc9M4p4MLeQTqRMGNlE+VL42CUzUWupcaVu7fYRdBPtgUMMXrPmQsdVyXDyyx8BVcvzudW8 g0m66e6qMDIlhMfJjVEcbgc= X-Google-Smtp-Source: AGHT+IFqExPesZgM/f1koff9qNfw4RB1gc5X7W1anqS7RYf47NPcsjIJhgvIkuCOh4rNke6QDcNaxQ== X-Received: by 2002:a05:6512:b19:b0:541:1c48:8bf6 with SMTP id 2adb3069b0e04-543e4c3e14emr4839516e87.53.1738498570131; Sun, 02 Feb 2025 04:16:10 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543ebeb0a4esm950663e87.114.2025.02.02.04.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 04:16:09 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 02 Feb 2025 14:15:59 +0200 Subject: [PATCH v3 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: <20250202-rb1-bt-v3-3-6797a4467ced@linaro.org> References: <20250202-rb1-bt-v3-0-6797a4467ced@linaro.org> In-Reply-To: <20250202-rb1-bt-v3-0-6797a4467ced@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=6951; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=14MmxgXH6MGoKQlSv53fBwYT+gb2hGBEOWXu2liSlgE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnn2IBFb6rjwAzc/LtLub0IJQ3E97KS5ZYvnmo4 9FUaTGf/UWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ59iAQAKCRCLPIo+Aiko 1aWCB/9LhPHfYPcr9XC63kgQbDl8QKR4uhWY7biEsE/9+bT2eJE23+LbjoxZcHsTFpajYAOwpMg /sKB4Bz3qaFGlDXFGX//zpw/uqNouyTifuiNvBH+FE2L84UUBDTIcNhKo90vlDVx8hrSNjuLVMZ e8YVi2sBbG4yWQv3x+EW4EUspGJ18OC2TsL2Ha+4NbH5yz46FwwmNhzUTYesF6tRhhDiegPx/yU rlWYPPYNaGBo+/MTNAFwGsLhSx9o/Id74SSbhW0rEcywyEpXuCjewUADbTcjD5q6h3Llt2Uon0q o/Frj0W9DiDFumryeyofkgaeBivfmVR7MWiZbhLCs05d7MHt 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. The firmware for these chips has been recently added to the linux-firmware repository and will be a part of the upcoming release: - qca/cmbtfw12.tlv - qca/cmbtfw13.tlv - qca/cmnv12.bin - qca/cmnv13.bin Two additional NVM files are pending to be merged into linux-firmware: - qca/cmnv13s.bin - qca/cmnv13t.bin 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 Mon Feb 9 04:45:51 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 9F5131D8DF6 for ; Sun, 2 Feb 2025 12:16:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498576; cv=none; b=fFU7hWGLUDACjNynAbG2UqrA5ke7VO7byeWR7m8LwdlbF1pZkYrn5T8mOC/SWm1QNtkWrd2DqLvVtFmr1FWDOeWmzpxCwSME458FvYbuz7sNCzkUZ+T/955vti0op6WAtc05gQH5OIdQPMOoINzry3MITEJzqMk0n+ccSwbQFNM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498576; c=relaxed/simple; bh=bnFY74SBqBhj50zQ7HIO+wjy7JugjwXGjrF/pgpBgeg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X21gNz93tcIRaQvWobSYqLfCeI+tl3ijZp96020tDr2a0apNcUTzyV0h/pP2Zw70x1fmi01pNyVkNQM5sfGMS3P+N84du4QrU6WYmRHJ/yXW9VSFjtZnowv8hc5OsY+geDBvPJKfmHoxpTQOnW+DhfAp4PW+fZmS5LcF7ETtUPs= 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=XjvaC8a3; arc=none smtp.client-ip=209.85.167.45 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="XjvaC8a3" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5401bd6cdb4so3664264e87.2 for ; Sun, 02 Feb 2025 04:16:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738498573; x=1739103373; 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=XjvaC8a3b7IQdAv80RLwNFFNTb5XKUaatkgybRxWxxAjl3DJHysQcAJjKppWdcDgiX 0daQFehyX80f3o/qfsW5SXEv7F1ajfpafUEN68CYsXlRilLnIRVVAFEBWRj+J3/KXX71 2jGBXi4NzVQX+e+12L/ztq89yCfAFtxSwZqKFwHzFRBVwJxY5qWTLQWnPaqSqWDSXD/8 IYV166HnLbhAar5T0ZuRfU9L1fQwpAnv5ZNSNKpoujnqinpnsYDd97kc9WJoCTClWs70 m6G7/uLLMdq/GRn2KHVB2tYKVhxSjxDbYeSnWpNmFsdVnK1N5KolavBOE3dl7ENA6uX3 qtHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738498573; x=1739103373; 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=nLLd9axQ8hITpdnawhhNsztdW+h7OXiS/lnhQEalqUF1BZtNZtqnr1LfchFtF0It57 CPrTSkF4Qx6dLtTXtv8v2mrcVXbyPawNJhXs5oD8/cCX1PN8tN/ic5dAbaRk5Z7FlKza hAh9gC5E+RcGzcOCFe0EZi8jZ0g8S8MrY9Ljkr5lhR6wQHY/RC6Hgnqy09+WMan51yuq 75f/diIXnyT8KQXmQ0FZKCZciuhXH4yvKfhoyNFl7NmBODqzba0Ja8a5G9/9aOe0W/O3 DQ282YwgnhmaBWSq2/TR3jihQQxlMFT78hGS65d9jTbfc8pisrsDZHfpy7JKi8ErfVO9 t1Cw== X-Forwarded-Encrypted: i=1; AJvYcCX0hTGPWZN9jCh6KJlYjLE/kUktb9idX/X29GE31jydfmCWtLSieNUx4nA5XwZtXrQ0p+VYOe3tOT37EQg=@vger.kernel.org X-Gm-Message-State: AOJu0YypV3YZlxmja4UKutKos3xZV3D9O6n8vHyKugjLQiPR6CibdYBh BfzrqMeUDomkx7rY8ez0lG8HtUSzPrydraXlPtq/UxOhHfsIInlUqBndhCX4GyY= X-Gm-Gg: ASbGnctnNVn4/tMYGgp8z4tLUvGmBlMuzkU4vsrMiyY9cm54v7aalFHe0DWh6ET8yun fBQQckhCYpfEVTOc0yOLJyjZ1raRYSILmiRTB2U/xtbJ7i/L4gpI+OmMR4u5lQEPry1luSGBabM ACKln0Dw344muO7JTRy5vmfOEFxJ57eftpeihwNwfTAZUmCNu5TbfeoTZDD5XD1l2GlCbvdQrgM OmPnkz7DbqRqMTeMwpvlScDELNnWlbvRaBRZtvu9i6sW4sTKvWYAJkJCUZNqjZ4e9/5i6yhalLT qqQGybbpkVv1UzObeqWcSOQ= X-Google-Smtp-Source: AGHT+IGuBcOzQL927cB5FV4/ZuTsXXAU3wO7PgScQvvImNPVGOdUn38v0cBF4Hvx3gUbQcbfzEj1LA== X-Received: by 2002:ac2:4e08:0:b0:53e:350a:72a0 with SMTP id 2adb3069b0e04-543e4c3c390mr5333833e87.51.1738498572765; Sun, 02 Feb 2025 04:16:12 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543ebeb0a4esm950663e87.114.2025.02.02.04.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 04:16:11 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 02 Feb 2025 14:16:00 +0200 Subject: [PATCH v3 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: <20250202-rb1-bt-v3-4-6797a4467ced@linaro.org> References: <20250202-rb1-bt-v3-0-6797a4467ced@linaro.org> In-Reply-To: <20250202-rb1-bt-v3-0-6797a4467ced@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/pANAwAKAYs8ij4CKSjVAcsmYgBnn2IBBLPEdQCC3ksfcheS8J9refVsucnZOUYFO K7LsNfa9eKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ59iAQAKCRCLPIo+Aiko 1eElB/0SrSwPCWoZipLwTZBl5iMAVtXzwAS1zuxbnoBHv1w2dV4fGQ0i9ZjaGAi/Sgln+/0WNy5 BMNHiBd/Tel+OkzyAhlo1IEhfA3lP5LScEymb1Zmfk9zs9cgdajCH4XM7rtmVV0ozJVqgoz778g JAfvDDfbdtBGrw4BMvmAZWNGCN6yw5uprlhmlmPj+wFgvwiKwtYnzFJ6svx1hEesxbSX9Ef0B1F AuV12GuNiEhEaxVeIEhQFIIsUYPFvCrsNsRZojRT47xkVHXsQyV74XBbCXr0UYZmv/SK7XCBtjI GEltn0XJ+KdGTI5TWiVNpOYMlRejSDdLynXT7NHaIGNdNhY5 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 Reviewed-by: Konrad Dybcio --- 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 Mon Feb 9 04:45:51 2026 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 2B6C91DB126 for ; Sun, 2 Feb 2025 12:16:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498579; cv=none; b=S66tQNIKt8X7fxgHY9VxnAq6zYdNiraMJ1VzipUZ2lRwuASVPgRNqMdH6N8J5BlFMZ1z89QbDW0fYcwpeaIN3FICeyJvUufDdeoxUJpMPa6Gkx439sP36QFVJ4IfIJhUtlTHCKjShg3Vzl0ZvXcAXNG89dyqgwpKNqHx2ipaSWo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498579; c=relaxed/simple; bh=qi1V0XhBkBrxty8uIfZTcLxNTnebQC4tHcL8urIKw8w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZSQbt2IfFBfbJ18mJbZo515BeAhai3/IDLL2ZV+Wpdq2n20wTkRy0hNLrCvlsagRbwCp0SZa43mrcHcnGKuycXuEjudlqqsFVt7ieXr5fEeVAb4ZLetILX3X8PHDzvf6TY3jvhSOlEsAxKvXVBG34W25ay/RB+Trkib5cbNggZw= 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=TEdI+7XT; arc=none smtp.client-ip=209.85.167.46 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="TEdI+7XT" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-53e3c47434eso3657952e87.3 for ; Sun, 02 Feb 2025 04:16:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738498575; x=1739103375; 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=TEdI+7XTqTEubyvnS5zVcYGozhu0Va61rbeAYZVVEC97eyhFgM8o2F9FEo7aK2ADMT IYP89MxOJcSFyXssWNfXWAPv7T8m1/N846X01EH4OGrY1Rfcayy7uibbEcgqEeGEtATK yRTRyYWE8DJC3BicZ41XtlGscwHn3qMEBP4WCZJZHOml71DJy2oQ9Zu7GwILTpXE3t1S NY/HFNV6MTRwKlMOK357S56nnKx9cQdjfgVozCuet9PRVqil1jKwDdoPK3dPwqj4P67y aiSR8HGe7WdKMjT72+irLwGmIORRdseqMAwJSvOTYvUrdvoqElZ/tLRl9vgwCC2MzpYe 21FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738498575; x=1739103375; 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=NIHTdmOCJmrYSMQCH1LoSKLvf/TLHiddc6Xy7qW4TMOOcJ+968JeQY6rPidOG93Aa3 vgT/D9LO+kjvOscPTqEm/eGIG6NDoQiZx0A7eLlzHYL9GNDNPeuu9fVxOQWD69c5j8F/ 9cvIxdm7gzLYVMzStu08XB4JGKsphqpIP7PFnq2oOkzlvqd6RxDF9NlXxGu79GrbNCW/ sdcDpxN8jIJ4ed8irK3W0IzUdYsL7YvHPsfgP0NOjFFO0dEENuidjfy0WKDPPnXY5Y8L 7V7ekKi79N7CcRzgpgTnY8nXVpxEzy8YorfDrIk8IXgo43l+GEvgdJO5LTT/LAt/zfGO phRA== X-Forwarded-Encrypted: i=1; AJvYcCX3S7UNf8/qZ6X0gCb0JNPVoUE+MuQy9q1e/DCkdBRQhcOjVFiLA6fe9OZnt698YPpx/CVOnFsuUt2ArVo=@vger.kernel.org X-Gm-Message-State: AOJu0Ywjcg2H1Lhrq+WAF1OeLVHRrPna2Yj9VTAk8N+NjxNLB7+JHsOR Af/l/MhgIAps8cXM+RrzuvhcTdlDUzU7ICxUJJ5UCNK+wLi5hw0WYNteVpQ3sqE= X-Gm-Gg: ASbGncvfpfG2K/6K1sCq/3esL8rb0FrroZLYxBx0hC30LMbrfGXTdwoF3D/Gl926wqy jKGNQLE39MmXdi746U4Q2H11HqH4N9cUytp87eRLeHj0C637yZE8vqqhD0UH9s0SvSwljwX1i+y 0dfvzGz7GeBNGQS/LDmys/tIfimQXzo9uiw202A3iwSDjbD7P7pyiCqkgzeWcAk6tkqY6iTaslP 7l1cWvhB3emzrgysiSHFQCK5pqAEIdNP241WQmKjKl4owNZadnEwsTrEgTP8G15xBKREM17VpEJ Qi5K+W+BH11wrpHG45ZJ8Bk= X-Google-Smtp-Source: AGHT+IEStuw9o+gIF0rwYX/wMSf2YaSVPtLa6hRhzgOqIJakeawWoXldDD53yCCCQJw1KAq/Lvfg5w== X-Received: by 2002:ac2:5481:0:b0:540:22bd:e25c with SMTP id 2adb3069b0e04-543e4c3e341mr5506950e87.50.1738498575292; Sun, 02 Feb 2025 04:16:15 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543ebeb0a4esm950663e87.114.2025.02.02.04.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 04:16:13 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 02 Feb 2025 14:16:01 +0200 Subject: [PATCH v3 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: <20250202-rb1-bt-v3-5-6797a4467ced@linaro.org> References: <20250202-rb1-bt-v3-0-6797a4467ced@linaro.org> In-Reply-To: <20250202-rb1-bt-v3-0-6797a4467ced@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/pANAwAKAYs8ij4CKSjVAcsmYgBnn2IBpNre0AfGfgYIuxjDMYtVtRRhCxGUwpA4C ULnjgth8a2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ59iAQAKCRCLPIo+Aiko 1XDrB/4lgRe6AgOcOU5otx1lEGNzlnAQIJC+2WkA/BSJEcC9D0A0urNkcZ7wB3cm2b3onQ0i/nX 4iyXBRrCdB+Nj43n4Xhp0BGH9o9I2X4uKqI8qaKzuymWRE1yAswRN3YclV4PYDiyQIK7gkt1SOc xDpn+nxciNzU3zgd982gUQ7VKUZV9g68Da/8bKFc6w7Q6iwrR4WbdCa4jzCoFJQC+ZNJRL+m1fS wUJa6dci0Z8mz2GVZpV5Q8mYDgzz1f6UGMK6i96gB5CfabwtAbSoXiE2UPZezZSVHn0hzaJKLtt IK++NOU2Q33+A6j29Ras3sdtYG0jDMeiSWxNnuBo/sKbv6ME 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 Mon Feb 9 04:45:51 2026 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 D2BA81DB141 for ; Sun, 2 Feb 2025 12:16:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498580; cv=none; b=e4M+YY2xWuBls/fCqLVg7OLDiBmCdWzPs8p34yj+ohZ8fijiHp7FLcgrclzOHQmxhmP9x3tTxPe7mBV1VDcv9D8bBdx2NlxMe6hWOSxbgTje318MrVM3M9I7fTz2XuEiWjD9DwxFVkS40iq/MjSzQIPY2p5Ds2j1IZ2iN+PaFpQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498580; c=relaxed/simple; bh=JNFb6Y/XdVHYoGkQV0QeQUNrQN1lFqLu5lpLIO5kuFE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UXpIpKm60nJr/hXiD0DtpawsFH8zkeVWk1qurPIMBRyE/YzoRo9i9LF6I3XIQ93mDesDTmcQK7taObPJEwHnkDguKswvModNz7cKhxzzruepJp8M08TofKbE2jztprydizHizuT5NKfcTMHAPg3c5T1VsQBwysoDmu7qJM0eLsc= 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=oHl597bl; arc=none smtp.client-ip=209.85.208.175 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="oHl597bl" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-30219437e63so46686211fa.1 for ; Sun, 02 Feb 2025 04:16:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738498577; x=1739103377; 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=oHl597bldXrjDkLKrDwsqZBIFvlxUBjIMVBRgxwO+fb6o7eDABcNdC3HY+UQlVP90t CmDI2qVBPYQZAeijNunYGEZEPULJJT+8E/hJI2LEqARFHHB4OWiSjoSrexVB6xGlx1o8 +LLA9F3bIi9Y9SxwaWuvE7qLNCbeFQGIKA1mWdVvIKxhSKW/va0rHhPHZjaSeROnjw5M sdKPsBUwBJrx3iKFX08QpTddetsf3UlStTu2av92uSaDg6EkQZWEcZ3Bh0iRXWk7v5Px XQ1XD5IUHl+HEm9weG0uvncaU0nhXXPEn/EdkQNkd5lwXYs0PlLbdIuxHP/w0P739btr 2org== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738498577; x=1739103377; 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=QVk2wAsgcjqHGEPTM4uUmVCR1soRFBTgQHpldd02Bay27vXHwVfWKlieGKJ6e9dYxs /RKuo3h+W7Xm9u1OwuLYdSJMqe4Va9jDPGrGuKWRjj0eluYeZG2yKRmyulBV4P4smbm+ J0+i0TJZHyZup8ZI3kBsdpWH7o6A5cs/AgJ6i8Fhc/57DSQJRyogK/ic3RMnHM1PVbbv ZYzjfD5IHxe1tEmdyUiQezRUe1Ke/7pUHS7jc/kPdIv/5GTkAxtSaHXyqqfLBPHzK+5w n2Nao2GdUYKNNMzp/a/d5coYwpoxNGUsVQmK5obUbn0ANf/GRdr3xE1nnzTJoCSVW+rt B0tw== X-Forwarded-Encrypted: i=1; AJvYcCUP/IJONeYUH7788KeTKdqSRGKt9iKl/deQkM9ahx+ya59Gz2+q0kgPusfVZho30zNGexCV6LkhCieFaPA=@vger.kernel.org X-Gm-Message-State: AOJu0YySBDZ/UlhArrn97ZPWHEai3i1DxSgvND+I1dR4UNYnbJilxUOH JJOTw0BZuW0zWjdBpkgaIfp7zbI+k6QtErsD/PRxOpzFjlDNFcJkD0cor6XhKK8= X-Gm-Gg: ASbGncsWnguHF6YaFaOu7bV6VPrIsZ3nY6KejOs/Sr17W2+MYLrN1tdm8EAYxGJ9ATh ErtwdAR/Lyo1fDcXcqoFsPyY7pzVXNChGG4CEbiMtIAMXSiRxFcsd5XXysNXT0DY6sXZTH0Tuio YP0g5M1kqugVhqN8qe8ez9oLbhC2DZxMvXr4C5vaNSElTg+pJT7ZqMAS0HvpX2ewXxSVwNei0Pr yInjYwyUTER9kCPQ0Yze0qXrZWjEMYlGyVvbNXBl0tKaRWQUoVcGXT0rprFD+3kXxCxtq7lzs3s PP6vYGS56UFQVU0KXQCGkbc= X-Google-Smtp-Source: AGHT+IHU+cY7Sd2FJwu/fK+FejNxlwvrPxT3OOghYyb0HQvwwOLYe3yknR5BZu/qRImPl6zTGSjVfg== X-Received: by 2002:a05:6512:3d2a:b0:540:16b3:3699 with SMTP id 2adb3069b0e04-543f0ef2da1mr2889703e87.9.1738498576871; Sun, 02 Feb 2025 04:16:16 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543ebeb0a4esm950663e87.114.2025.02.02.04.16.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 04:16:16 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 02 Feb 2025 14:16:02 +0200 Subject: [PATCH v3 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: <20250202-rb1-bt-v3-6-6797a4467ced@linaro.org> References: <20250202-rb1-bt-v3-0-6797a4467ced@linaro.org> In-Reply-To: <20250202-rb1-bt-v3-0-6797a4467ced@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/pANAwAKAYs8ij4CKSjVAcsmYgBnn2IBlxn0ajqkpQJUmshzRsvUxqdik1OzGVj7t fB8L11OJ6uJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ59iAQAKCRCLPIo+Aiko 1UjUB/0XgJhzc/BM7b4PFzB0HBDUYi2cf0F8MCk7zDlSJF2i5R7Y9caEeQDxOtJLsLwumoRLsHk agl+SbPPMD1Ko63Ke//UhzKdl3q+0CSY841s1KHQaXSMTBnA3rb15CxX9c76QhEStY1pKeMpIIp LQOjfnEMjl+ZptAlrSK7lrcLtJeISceoQK0NVWvkEv3S1p9M5F200noLOF0mjxht2cp+JNvJioo sCCO0nObmvH1ncL0QIVmR5PLmHkq9AdgSUbgY3J69PMNsu9Gb/ViXkZwziVsLYVNfB51JDs6B+g MO81NMCey11gEa1Q5SB+2me34bViqTFIUjHaNJhFg/W65eFC 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 Reviewed-by: Krzysztof Kozlowski --- 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