From nobody Fri Dec 19 04:00:26 2025 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (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 A1ECA1AB6D4 for ; Fri, 7 Feb 2025 20:41:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960887; cv=none; b=otdcgScjQy7pox3C9r0JH6oOq++IytBR32kBaJw4d1t5kvuiSWry5ODLM7e99CvXC4GeYQYDObBv5mSnp832LrLW2Cg9BJcWwrrcAVGej2yIa7lSQfmPPvjjcO8hrzQKmjrCYulFgwyqbl/U1IGu87+aeB8Q84H39sNHnt79N5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960887; c=relaxed/simple; bh=s14YKYID9PJaE3calGZbF8LnlKIvHymDbj6L+7VVrMI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gpNkAAjM374qNRPBW9lyV03TfIcuPp+66apKkZJ1onNtb5vwKHV4qQwiuUKGPOyD6Z+7JNS4PEUS4JyrFyA42vd8dfTKVOl0azOnn4FzMXR6MZSzBjAzxz0Sk1xQ/9bomjYjDlLkopGkar54vA5YOrITDeK92n8oxaklZXSsSOI= 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=WzDKg+oS; arc=none smtp.client-ip=209.85.208.178 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="WzDKg+oS" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-308a559bdf7so10018161fa.1 for ; Fri, 07 Feb 2025 12:41:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738960884; x=1739565684; 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=HSlGgKqz38+k78ygp0mcUEOzYQKAs3hlnKXdF+3RtWk=; b=WzDKg+oSTLe1MMSevZxVsh0JQRZ/ZbAhdwMQliFqLf+J6DNgbJ4iwZTGULujH/R2tm yZrcgz/mnLQGm1n+2vVGPMC1eMTPcNogO/AQvjL2ZMlQXM1r65JaiylApApsajiu0GZT QTZAJM0AwfH/kdI1DYZXl4oDd6uet9eTibIpOIzqnOOYcsdfFrqYAUaVYY2DvOO+9gyi Nnb/V6pzzA4XdO4PvIx4vl3dKZPFWbdIZcMGjWG2Iay/jqr1oeVygFP+2yho6Tupjou8 NTDUWkpPPzfe3BZPwjV/UisuKrAROl+F5LDXIxTm4ANqfXgKnJBtgHMWWAhClXhznLBX M/rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738960884; x=1739565684; 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=HSlGgKqz38+k78ygp0mcUEOzYQKAs3hlnKXdF+3RtWk=; b=ooDEhNpgT6lhCYVsUjWMSdf3h5Ur88OUBDOHv1vcn98rv3W8uKFzSxjuI6ACeMuCoU XOnQHAUIasj9nulY0rSPknXmDQcuHJM32RV5gwnY0cmvl+eSOs2X2ywBv1g2jKcFF6Xg M0JZVM7u7C8QauyC2oaCfEDvI+wuz/tcHwW6+pAEowDqPZFtXhRFD8z52pFGFntIZcVv c40dprgkvYYUVwB0stYusFXlpeDFv0VV0zuy3SrjhVP7T8EmTc2TCBXDKkdAHloTQ7iB 4oYauHnP/VKuh6LOGiw11SXM00SgQgpQ3PLgjD5VhWOK58I19Y0OwpNYMVS0wxYG3eoV v37Q== X-Forwarded-Encrypted: i=1; AJvYcCWoeu2ZUHG893F3w75JI+3sDffWgJ8tjrCBbItBynP7PieftlvbWh6VXAlWVxiPj3iF2rB8Zx6C5FenxVM=@vger.kernel.org X-Gm-Message-State: AOJu0YwbDNNc7+FwHqR0BY/b6wJ2IzK1iDIs/zTD8pDTp416xMmFWwvw 7IXrOOfLj2qj/OvXXe/asj0lUKsgxuLnTWfjI2Ko8EYF1ukD9V2yiD49w7PaKLo= X-Gm-Gg: ASbGnctz06cJRk0qcjgouXfCoCYMdG6j1PwOvTkCiNeFuyaJo51eMfYi56hCQrOTSA3 JJFQr8f5DNuUXxSlnReUV/+WPvS+V+DMIJXs3XCS/DoZ0mzWdTkvbV/9u4fKNCmMV+FGy/bit1c oUtZaA9yjZXpS9z/RY+iD1t8TJxvJL69EIgq5477RSZe3k0WFJPRAuvJDKRKGCDQzuvn854mkAY ImQwXpl78ZrcaYfZOAgMuN3ZZIZFmAfDCNIfi8RQA1A6QEPwKoqO/hr137h1WiBsNB2mnfpRsHS 63ZbiSkV3dMVWwOsU0lUYZw= X-Google-Smtp-Source: AGHT+IHngABXa0RfWQvCOT+hZ5/tEP4wpFl7H3wFVT0JpPMz/eOAilEh8xFb5Y4ccK82JrxnO8CDlg== X-Received: by 2002:a2e:bccb:0:b0:306:1524:20e with SMTP id 38308e7fff4ca-307e581946dmr20024521fa.18.1738960883630; Fri, 07 Feb 2025 12:41:23 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307de178628sm5343811fa.10.2025.02.07.12.41.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 12:41:22 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 07 Feb 2025 22:41:15 +0200 Subject: [PATCH v4 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: <20250207-rb1-bt-v4-1-d810fc8c94a9@linaro.org> References: <20250207-rb1-bt-v4-0-d810fc8c94a9@linaro.org> In-Reply-To: <20250207-rb1-bt-v4-0-d810fc8c94a9@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, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1268; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=s14YKYID9PJaE3calGZbF8LnlKIvHymDbj6L+7VVrMI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnpm/ti0opbMT8jZ+Ob3h/ZXQZ/AbPR399emf52 uE20q302/yJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6Zv7QAKCRCLPIo+Aiko 1eGLB/9AaRKZTGVR5ln9tpeVIDGYjwzGp30+jHbKD8kNkknwOhjF/cwIoBbV3MIdBLKkPE8aAD4 1P2AKiseT9gDvt/7CTosS4h9ZOx8VvvuBDZRXJfKv7FxtXXiLQr1BPvCg9jbeguSGVhqvtRlPKJ 2y/fS6uc8pg8dxpCCp/eMMx8CDIBov7IdNWkF3GLs10tWH7yVmB1xs4VQTqD7108U6L7Vbt1ys1 GWQR8bSkdzA/VLv3xJueUDqCGSX6Z6bX2/dqdUIFbebtT55N+qnGUViIymzy3eEzXXHnAlrAtBX 8R8Puv20Zs2+zIvMcQn0lH3tH6qe2BnZTBZ1tAQrRA+PQoEV 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. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Dmitry Baryshkov --- Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml | = 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluet= ooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-blueto= oth.yaml index a72152f7e29b490003114dae1e36df85cba384df..6353a336f382e4dd689d1f50a62= 4079aa83b2ffa 100644 --- a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.ya= ml +++ b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.ya= ml @@ -19,6 +19,7 @@ properties: - qcom,qca2066-bt - qcom,qca6174-bt - qcom,qca9377-bt + - qcom,wcn3950-bt - qcom,wcn3988-bt - qcom,wcn3990-bt - qcom,wcn3991-bt @@ -138,6 +139,7 @@ allOf: compatible: contains: enum: + - qcom,wcn3950-bt - qcom,wcn3988-bt - qcom,wcn3990-bt - qcom,wcn3991-bt --=20 2.39.5 From nobody Fri Dec 19 04:00:26 2025 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (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 EED131AA1D9 for ; Fri, 7 Feb 2025 20:41:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960890; cv=none; b=r9MCviSyfoTPPO9/l5lDOS7AJ2BZFaTUAdEJnQg3lkAPEIk2lkkvmI+BCZpcAmIbewMg5YRh8LJmZDkJ6E95IigjApTmhkr7IUE+JuaaOEWuoXM4iepsg9WaRJFwWliVurc8hQCi8bCF5eg5IsZ22YbcqUB+bFl3wXDWDGU8ALM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960890; c=relaxed/simple; bh=XL7ng8U88IdS02LpqkHkwAED27Q7ZWUI6j1I8zn2UOs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GV8E4jgDXSLm1AJ6iPk9ly8G41U+YvNFDO3GFNNRwJja9i0o5SmAQD8ewxVCuuzLVfEGWZunqqU5MvSNz2piT8td/0Qfr09GU/rFHZlHuZ2ofzJIRbTrSQvlAa7rfDp2s8MQPNqJpscf2ALEM16hK5lyY9b3DBqbD1kaA9ggNTg= 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=d4XS0pQS; arc=none smtp.client-ip=209.85.208.178 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="d4XS0pQS" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-3086edccb4cso9516341fa.2 for ; Fri, 07 Feb 2025 12:41:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738960886; x=1739565686; 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=d4XS0pQSQOVbWw+0OUFGpQe5k7aWUuvwgIqxk+3dclpyH9J3KD6bTfNuaG3xBE3a2y JUHP/7esVvfygbaQPZxAOusPcoieHOCnDArnnar6ucfknzaRbCTsKdopv7y1Xj595wHz vYARRZ7VBIxkvWEiQgWmrPMUhS6AaWVSC2AP9E7dW24rFst+9SCy7EhPtJ/+xEjDcMoO l0eY0MprFGVAhsAzxOJ4+N4c1qvy7liEmscNMfbVNn6arIUS9Swe6zwQpOGgXIJoaVr7 vc8q4TgmhYgCRi4mZVxssjgEZr5Eux2SoW6VqYVod0jPdPwWLTito0FW4XXrHdNx3vte KBMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738960886; x=1739565686; 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=uQLwpS1BqxjeUJervHvOuD9x+Tnh1jfpX6iaiP0fMkzzfqde5YvCuQgnHY5nQ2J8Mg 6K3EGOnKRmAwRxUshDqW7cDnSj/nr4DsggMgrkQeiZGy6VOzySSyYEMUQXXCOpPpqNl+ NnOmXZLmD7G6I8N72R3H9a5BUzo/bZvKIK21ZAQ3KKbo0VJ6Oe+mdbmK+Aid/SuycuPb uZKT/FJvmnPrPbbbXV+9E9Xx+yk0zB5yjUKnosPjpjXTS66mlg94ux60CRSV0lPLFPrz mbsZ+gQc+KvaA5oZeHdL6ANEOkJ/0ZD8FMBEoqnZlvAaxzqqpOxPR/IaBM3JGFLYfhpm UN6w== X-Forwarded-Encrypted: i=1; AJvYcCVlvpzSCOPcpAKNKdJKsKtTgi4hyIo1OF1SAbpKaMfwL4AHoDlDVip6j0OzyOrUjdXi4OO+syV8RByt3Cc=@vger.kernel.org X-Gm-Message-State: AOJu0YzBxCaEFoz7HUsU/nDCuQNjpvViZ5TN/GHXuu1RuExQhku5gfb2 EDds2G6Puv3pgK0qm3FttyGxr26UfA6JtMXALCpBE7QgGQg6JGMQ8PsrnluhbdIJwNoJW/4N958 HJo0= X-Gm-Gg: ASbGncs3CUwn0kSXLOBO4K92Mvo1210T7mFXuoQcFw/yEKxGZ/veOmtmo2cKpsxat15 no1aT8e7k8fCtMdZjNS00j422NsZ9s9IHv90UgWbauRIh9RWBCUF5Pa8FVNsBNaPML7hgPhSJKd oq5weVl/t3YGXsjcdIuGoJhG+ESoQCw6R3j4/A/V58h8JNnRPJ13YktAb547XK5pzQxOPnTKW1d IxdS0aagGFdGHfoeShbqRz/O9sgyF5bcKAOnM6KGMSVJ7fFYEvCrgdrygZ0GbtnHQ3Ag54Qa7Gx hfWPMBdKA6h3JngYlnPVt+8= X-Google-Smtp-Source: AGHT+IGtmlenPKj9LmASZRzoEdDvspUQmr0gkUf8MuzFWT3Zd9xILG1u2wmFj5LYB1kI0k75o0Hs3A== X-Received: by 2002:a2e:7d1a:0:b0:306:1302:8c7a with SMTP id 38308e7fff4ca-307e5a8de31mr12160461fa.36.1738960885956; Fri, 07 Feb 2025 12:41:25 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307de178628sm5343811fa.10.2025.02.07.12.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 12:41:24 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 07 Feb 2025 22:41:16 +0200 Subject: [PATCH v4 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: <20250207-rb1-bt-v4-2-d810fc8c94a9@linaro.org> References: <20250207-rb1-bt-v4-0-d810fc8c94a9@linaro.org> In-Reply-To: <20250207-rb1-bt-v4-0-d810fc8c94a9@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/pANAwAKAYs8ij4CKSjVAcsmYgBnpm/u5muoe3WwA41QWOGX33TQrFVTMesUiPrQ/ 9pnIvcxGl6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6Zv7gAKCRCLPIo+Aiko 1dwNCACV+YYSREIUcBJrFra5aFyY76q3gLdPuk6s/5St8iZfxf3G5YLyCuDF4Ft4t4x/KlxZr9o rx85D9wg1EtUZTtqSYUkty900t2wUt5/jqsZ29LWTuvEPjHNYXx5Fxw+b2/PwC2gPNhLjWsM+LA XtlyLGXBH0eGlfSx/vKycONM06vPY4qImK5bt6x8qFMmvXLqQ3y7++Lt0H4rE79TrSvdY1XuYsd aMJzzVzQMf6NVzPTiycEqafs2mv6KlO2bUvWny0wfRctl0B4G3cxE5HeJJ45105BTKbWJrocosj KoILNJI8aj+AvbzAyIqQnvmiK/AKfFShcGr8DpavtFuV7gha X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A The WCN399x code has two separate cases for loading the NVM data. In preparation to adding support for WCN3950, which also requires similar quirk, split the "variant" to be specified explicitly and merge two snprintfs into a single one. Signed-off-by: Dmitry Baryshkov --- drivers/bluetooth/btqca.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index cdf09d9a9ad27c080f27c5fe8d61d76085e1fd2c..7d6b02fe2040ff16d9d62de6835= 71e1e1900fe85 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -785,6 +785,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudra= te, const char *firmware_name, const char *rampatch_name) { struct qca_fw_config config =3D {}; + const char *variant =3D ""; int err; u8 rom_ver =3D 0; u32 soc_ver; @@ -883,13 +884,11 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baud= rate, case QCA_WCN3990: case QCA_WCN3991: case QCA_WCN3998: - if (le32_to_cpu(ver.soc_id) =3D=3D QCA_WCN3991_SOC_ID) { - snprintf(config.fwname, sizeof(config.fwname), - "qca/crnv%02xu.bin", rom_ver); - } else { - snprintf(config.fwname, sizeof(config.fwname), - "qca/crnv%02x.bin", rom_ver); - } + if (le32_to_cpu(ver.soc_id) =3D=3D QCA_WCN3991_SOC_ID) + variant =3D "u"; + + snprintf(config.fwname, sizeof(config.fwname), + "qca/crnv%02x%s.bin", rom_ver, variant); break; case QCA_WCN3988: snprintf(config.fwname, sizeof(config.fwname), --=20 2.39.5 From nobody Fri Dec 19 04:00:26 2025 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 3A4121BBBD3 for ; Fri, 7 Feb 2025 20:41:30 +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=1738960892; cv=none; b=MxqOD/QpErjA8byaaeYkwCtA1MAkJCG70VAeSq4M3rcIgqnocAtGuA1eZJ2txVDG1LCqP9iHRod/SnSekLVNapdYkelj9Fi5Lz/mHixeDO8T5TmkDP/wBBFsXt8k1d0MibYAScogvgLn9NC7uY1/+NJn/EqBJ1Zqk5RKd8dcF/o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960892; c=relaxed/simple; bh=4YP5ILDAhWLFOzXAyWykx1y2KrD6Q7IeV+E11CzXC4w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AS1iYmJoomTlphQvKENPEd+CQzRfRYTmID+cqqO4uTsCwn/v5nh0WC9RDUCgFJxP8gFViP0mW1M3WfQUjJ90dA66xx9MXxPigDRHAK6586yTSVkcx/2aDRjirzLiKCZM6lnN76A3ZyhnaSKBZYX8ek7VOcvJieHVYGzi5ql4M3k= 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=JaGm9Krs; 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="JaGm9Krs" Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-307bc125e2eso23338731fa.3 for ; Fri, 07 Feb 2025 12:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738960888; x=1739565688; 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=ckV+zDmxUPxFXOUa/QFr85H3OeY0Ep07vfj0NguxjGY=; b=JaGm9KrsyXxH+w5GHqlVwvq1IC2IVbzTtAEi/5201A9c5oXUSpf0/NBa59fvXTpNoG vnNbGiTo/Lq/rWOzXq98HMISSpEJHfI5KM7RQLaJWOekSELw06SM3vcqh99fBTMjTgps SoUxPsPpUv5gRkFC+a4LHSM7MOwkUrle4WlolBTIO/XJu+kOhW/o2UnvTmBjNKOLZ44u c4vhoSTiC5RVQdPTaLGmBH8sPoNWVK6EefZKHe5b/sOmeje2pK3IhfsLgvT4p2ry5/wY wsdCgz3+AvjEGhaoFhInr9X7X8BlsNeMpsgb7Z8+WjK2/U2hWgMjdBTeRRtfz/iruAv1 gDgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738960888; x=1739565688; 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=ckV+zDmxUPxFXOUa/QFr85H3OeY0Ep07vfj0NguxjGY=; b=Y4V3IGgVPa+HJEURs5JK8yLWDgIRfpe1JLOV0B+kyh5jM529Zh8W3VK/OmWoNng47Q JQmVrFvnfJxERQ74uPavJjfJtRUt3cKX2r75AF7fKPZDMRx/NWPwdDJOQMqgr7gOZibi 0DwtZDalzGNh94ONWEmvz6v+mcEMT/eQrboXCdnzeregsCE20pt2Q0m8Y60rPivda7WS aFJ5r1stOnzR+zm2mvp3usdg1z8etX3otb5rs9fvLBDkV2YQ1XLiCWb3k7MaXIJFTsfF x5cxtMrxQ+PX+UaWg048G+NbUIQdo4zWL2Qig2Sj9IBGbN3EuGaakpWpuX+2jrMhE1et 0Ylw== X-Forwarded-Encrypted: i=1; AJvYcCVpcAfa8ouqBqifE4oZmaCoW+N2A7PKpF5mzPjnjUo+p+woJSK9cllK+F4D58IQTMhQHdZaGG/SRIHAAGM=@vger.kernel.org X-Gm-Message-State: AOJu0YwTNE2P424PEqQD7nr4CXS7oJc4sAxLM4HpaKRo3F7xZsQa1P7y D+rGG5w9h/k7Uq/Ib1qb1/nD+838HJHxTlA7KVxyxDtcVLPeiOwtf861y/efBEU= X-Gm-Gg: ASbGncshu/hiMWaj0t2X+ZwdShMiFaXn8PpIgDUWpt5OHt/vSg1IozBJmi8UpvproWJ pV0sd1zAeBNxLmUBIqT/wV7ShuqBmYJFyrUkXXEODU/8L0lgGRZC/P485IeQ7vNQSuLDBErqEOJ prPEPhQo4Km+0JLmn68TprY6mEyn7Nt05IuKPhbxRW4vOHcz1xUxhY5gn995hrKANqeNZ1rH1Ld zEJZn0By+RvbGLALy8yT0tM+HDpRMufZ1GJMkclv5XhgGLQKFwY5hD9IBPa0W7X1Mfwe9hiXofj kouvlyIZkcEK0zWNuk4NvB0= X-Google-Smtp-Source: AGHT+IHAF171jwGreoAfCS+qIAXuUNgCF0vCCbR8Ca2fWtNNaE2jDVet0J8Ww4xEbrPz9K5hZ2BfVw== X-Received: by 2002:a2e:a98e:0:b0:302:17e7:e176 with SMTP id 38308e7fff4ca-307e57be353mr13604501fa.5.1738960888388; Fri, 07 Feb 2025 12:41:28 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307de178628sm5343811fa.10.2025.02.07.12.41.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 12:41:27 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 07 Feb 2025 22:41:17 +0200 Subject: [PATCH v4 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: <20250207-rb1-bt-v4-3-d810fc8c94a9@linaro.org> References: <20250207-rb1-bt-v4-0-d810fc8c94a9@linaro.org> In-Reply-To: <20250207-rb1-bt-v4-0-d810fc8c94a9@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=6877; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=4YP5ILDAhWLFOzXAyWykx1y2KrD6Q7IeV+E11CzXC4w=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnpm/uWi6QsFuEkb18jSOyduZrhX9EB00S/e0By yxcT+3Wh5CJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6Zv7gAKCRCLPIo+Aiko 1ekACACt4s5dnfutKVpPRti/nIUchrWcJGS3N34hhKnAdfhS6ZI1vDwjL3Ej1S27HQuFCvmurKQ uvGPYh3cYu8XSq7DHm0f8ei9JiWTL2isrW7rKdn5/3rpsQ/1VeUvkiHMqcAJFSCCkKfR7yi5SyE CHHK8K2BzNYtJds0w/ntXEt7wtq4p9kQrXB1AWW/1rDhBR2hPQC7BlmLdHwKwCmVSe4RXemMXvG lU4gK42mIDL+56yOqjzyS/95qRCxBgqVyYG+SJF3sNhJVaM8Qnim941wyJvnLrjOrHsHU20nYVL IEVoMnizAuNguKThkm5CIjHNHiXM3uTQKSCJTbwtGc0J/P4T 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 - 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 Fri Dec 19 04:00:26 2025 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 BAF721AAE08 for ; Fri, 7 Feb 2025 20:41:31 +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=1738960895; cv=none; b=UXq9sGFLpQqdtVV18jxMRzwUytdunjFkTHVufcIw/uqSdWd/oEJfBMsxWaQLy3ZJ24/XxVonbO9DxR8/E4tplAzsBLE8KGpLZVixAihOG7lL5cSg7xeqrhPK+I9CAT09teQ+z4BeTTRGXgp/noZpIfNB11fp3NP4fKn4cMUdLMY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960895; c=relaxed/simple; bh=NUqFnkgEJyd8qAOCcBnUZHRsatlfc9uvOXSSW/6REWM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SI1bQ29pZ55mrzRcL7azAikmcbDOId8L+2YdkhajmuxAUU3ijZRabwaAHFWdat2KE3Mdkxvxl1p/TAdvFsnDIhu60+1/Tyk8MyusZVhpcKEunIAMezITFPcb30+LqXhYp0vbqh4umvoedrl0pI+96ckeXIpSLaWjfxraPLuf6ro= 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=doKA+8Re; 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="doKA+8Re" Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-307c13298eeso27953091fa.0 for ; Fri, 07 Feb 2025 12:41:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738960890; x=1739565690; 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=7gl6uIUQ+SRtnNn0YmoDk4IwVwtpgN9AtLN/o2kDYZk=; b=doKA+8RejbgZddNHJpiLMAcTauJX3Y07F9RRgT+zn4Fi3+9UU3sf3ky08UpVxudGoC BviKYE88Tp2BnT7pqFYC686AS0A6A1FQF12X+uaZeHLpBy/nR6U4k30oFVU9ay4Buh6s 3KQp+M1ITsn2HZrVcfr4YjTrvU/U4qGfN9GDdQUG037sEc8uDNQOr7Puy+xCnsjSFq8L vxinYc+nkjYev0GfBM1wZtDlkA37FG3mU6g/GROCV+XXsHorb4hqghYBHhRahCQciaNg 7Tr8KfJTdKmQN0acwyhLsyYIZoRZ9DxxDS9IVFI+82uEGkLfHfpV4suZE/ep35chQkND jS6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738960890; x=1739565690; 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=7gl6uIUQ+SRtnNn0YmoDk4IwVwtpgN9AtLN/o2kDYZk=; b=DFbJ5Rbpds3EzpH3FmhOEsssyyoRdQJcH7BTdP4QPMjahU44bfBXeUAWtufQGDVkqI lI08gQbJcZHzfCqQiT9RSAmq8Ol2Mt0UgB1iwvnNt8APP4M13DoY36cgLoNka2ED0CNH FfIcNLcQEVDlH5wyLjMJR2Ui5bU/IT6WYsWH8sVmYtYlssSkvwRnJuaCy3BWgqH02kta 9Zlf7xwq3fL9EfScJLMPK1OYVbdKPxbUY6ctG0sMR50BLS/kXurU8s6BI1/ROZZsuYSW +1MmnWodljOFQKbi9zIfkpnlmk89CjxzDNEHB1TOudPblbB1A8EPapnEUJ8QTFXmO8Ed Dfjw== X-Forwarded-Encrypted: i=1; AJvYcCWp3PtPnQZrOYbEzAomGPRSpzhqdam1Gv1ZVNPwTPsGgYXD5aucJSAw8VW6qXYPGYue16LiMH0yvC70Aos=@vger.kernel.org X-Gm-Message-State: AOJu0YxEnFnNef8O/yTz2fZ0u6/SSJowE6W+oheBA2atmoVIbzUByqmu D6XVuQmO6sUjXWlb2abdauLs9if/Uxfr7+brp3txVgbM29N8TdP3cDPbx14LobA= X-Gm-Gg: ASbGncttTla6ID0Cq2RAU21B6G3/vw4n13A3CRhZuzDrtpRwA53AGHtgdPSsheL1e0j 5/OcGURyEGIU/bJv2drvAyQsRSJ2EVvgiza80ZppFGA2DeWEqxsQyU2IJF9hy5gmJj3Lyk0/GpY aaurlXIpDKuzoaV1bX88HNZFff2b4Y2OhYx6xK3sy33ySA6UxLFZr9ITbt0+5P4b4GSIzdL9T4u YqnWAMGA4UpIaQ2gANPvyWwMPMBziCU5Q8Ty/trNraaN0jDSDHVAj2GJO/lmFdnF/kC6gwyMRJ/ XvIy5kKv1BljqU14PEadsbE= X-Google-Smtp-Source: AGHT+IHb/M4fq/eclAesQyX1qyqm2opdvIwW1hz+G44wi2NHTIvLGxaNLMU9QXaZHuJ50RaoDvL3yQ== X-Received: by 2002:a2e:bc14:0:b0:302:2cb3:bb1d with SMTP id 38308e7fff4ca-307e5cf5defmr10169671fa.12.1738960889845; Fri, 07 Feb 2025 12:41:29 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307de178628sm5343811fa.10.2025.02.07.12.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 12:41:28 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 07 Feb 2025 22:41:18 +0200 Subject: [PATCH v4 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: <20250207-rb1-bt-v4-4-d810fc8c94a9@linaro.org> References: <20250207-rb1-bt-v4-0-d810fc8c94a9@linaro.org> In-Reply-To: <20250207-rb1-bt-v4-0-d810fc8c94a9@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, Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4143; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=NUqFnkgEJyd8qAOCcBnUZHRsatlfc9uvOXSSW/6REWM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnpm/uo7dpwwRiggT/r+0juc6Vw+YUA+cYrP30n Wu476ddcqSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6Zv7gAKCRCLPIo+Aiko 1daFCACi/KngyeZlqd5UPAZdmwD7vZ05C+LmRSewURQOppe62JOLDZ75X2OoBvM0FqzGEbY+i+8 KHxs8ysaHD/jLKEtH2HKvr9JohWEAWPDNBgCV3Wzf2UK9LK5n1AYDU9cCFQx2W98ckoXmNfZge5 s+Lw2Ht/tWCpENWvtpiUxCatKHzPn3Cfp8SVIzXgiWgydm2j9ZOzUqbAa1Oip3vCw1qnJiBrrE9 LGrO93vlN9QkUk16Z6u5Z5y7sr1cT3W36B0FlUdGup3NFi/jWdjVM7CnOIpvRz8aIXzey6wkN64 Xxo9Vbgwy4ym5Db1X7Ow/LUSFDIp/6ppoiB6l6fOs6WlTzEc 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 Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qc= om/qcm2290.dtsi index f0746123e594d5ce5cc314c956eaca11556a9211..6e3e57dd02612f3568f07f1e198= 028413f463c69 100644 --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi @@ -1073,7 +1073,7 @@ spi0: spi@4a80000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; @@ -1092,7 +1092,7 @@ uart0: serial@4a80000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; status =3D "disabled"; @@ -1137,7 +1137,7 @@ spi1: spi@4a84000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; @@ -1184,7 +1184,7 @@ spi2: spi@4a88000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; @@ -1231,7 +1231,7 @@ spi3: spi@4a8c000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; @@ -1278,7 +1278,7 @@ spi4: spi@4a90000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; @@ -1297,7 +1297,7 @@ uart4: serial@4a90000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; status =3D "disabled"; @@ -1342,7 +1342,7 @@ spi5: spi@4a94000 { interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names =3D "qup-core", "qup-config"; #address-cells =3D <1>; --=20 2.39.5 From nobody Fri Dec 19 04:00:26 2025 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 39D741D6DBC for ; Fri, 7 Feb 2025 20:41:33 +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=1738960896; cv=none; b=gpthjWDWs0dU9Z/qkpFzc2jQW0sVUwGPSTT/MDo7BhtZoABmtrC/zC3Rnl+T+Z4JsXchtL86krGFg/U97bKwItIwtRlTu9FXkJfoCD4ycM34hwX2aAlNzHbf8o5APTC/mfD886EIJbI1kTFoxoCzxa3Tz7S2g4K+pxfktJs/MPU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960896; c=relaxed/simple; bh=qi1V0XhBkBrxty8uIfZTcLxNTnebQC4tHcL8urIKw8w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GJCca6sOADSpyy3DAp1LubILSXhLFdt+xuil20IWDeS3YwUVN+tPd02pDUim/5oTSrWXJJvGmqQxu9ympM+3tEGZb4lBXO2UNSYBvmEVS7ZL5ZIv8kV5uOstPvgDU/SYeX1jS4iI2QRjvQz4KYRp4e8vpkGYqMeJVscCbaeQClU= 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=uRz7ZBIf; 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="uRz7ZBIf" Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-30737db1ab1so21444931fa.1 for ; Fri, 07 Feb 2025 12:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738960892; x=1739565692; 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=uRz7ZBIfl13I77jO5n3qkcDJbEuxw/QvHahmWrRrre2wNUhVLsJztlA9LYKQL7P/Yh 2WV6ILffS13z/RyiAa41Mdnk3jDgmqgKqZLVPAecLWfJdHvYiOiH60hOshTz03v6NkVY JuT/VlIelZOrBKX/R02AM8O6AGikqFzKw6A+rUtNH+IsXGVn9y6aJbXlZhkS3wxEJyCJ o8WL7kEAHRvx/qrC0n+Lcqrqj6nUZashqpgPu3YpIgeH+Wu/t95YNUvB++pZsBGk62Vw 8E82fkJ9R5e5B77JiiVbd+R88dVezGAgmR8Q6EzStzHHrmyRlab+iYd9quM1h9jyhCPS xbOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738960892; x=1739565692; 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=HdKDe7+ssySzMZWQY6XPGIto5kpP37nEf5uUXFj2XyBc4fC9vqpfq1aqpYJ/yosfwy yq7ACTgbxt5qd4RcPYna6RrIOaaeFbk29VUig0E3hBC3ZRxa9i3kvIoZjwKaye5VVt+V 1+pIo/m8jJ9OB6TvBV8oCc07D1B97ZgqcbFu8MiMMJvZ1RWN31nzPSXpBiAgRzLgA7DT VGE5yZXSm5MBMWYS8AKnA+7JyR1NYyqkB+SKYc1T6rHaiQn/cTbZQbLiIF9mqBsp3uim 6ppnd12A5lqKifd9WRQWYbEC/Dce9i+DUEuaCXhHN2OjDYJMeAt4CNT8MOkESqDDSG/y TjZw== X-Forwarded-Encrypted: i=1; AJvYcCUOzwj5KDC/4l/eYBE78opu4hNzo37o688WrfqiJ1aJyaEhxK4ikMlHaYuiHcZHuyqa3g0WxqlM8lp/CVM=@vger.kernel.org X-Gm-Message-State: AOJu0Yzu6sQsgawsPLWz8UlWdHj8VWqK9wnnedn3K801IdKWElAkFnxZ FGJQHUeNzECAbtzXK+qi7Zut8hFM/w/rE0PzX7hGN1Gktk/h0xbfQ1aTl1R264JuXDMD9pns+85 bsKM= X-Gm-Gg: ASbGncvGixJeAyJy6gzQ7GL4ngJ8oFzmEVXhWRXsqmyTQ7AyeZljmu1kwin5VYvBE4y Crq+2wGHcb8pb+yj56NUoVXGKzrYVlTt2vnyXvK9E+/fmsCO68KgDhtACDpzDag52UyoeMQPQF8 VZr6e8oExODXXGZlNq/eBLxTzvNz2phe/QFtnpt8wCFgcXWX0FuJCqVoemTeCYbCv7JuKV0lhpv Q6Dy5ZC4Bmh8hu+PFfcQIbLDQogkxXctqXzQBj0l8UeWC98VTmyEzPYumlCUMvurYln+X7m1/SD 8TemS0eSIaM7y/X5EVs9Q4c= X-Google-Smtp-Source: AGHT+IEBrJZCd0Xop4TqN7hbfRaUqlV9yD/Buv5vFYZSETU04EFffkRNpJDvdRhPM0QpF0NR/3WMpQ== X-Received: by 2002:a2e:b8c3:0:b0:302:17e7:e17e with SMTP id 38308e7fff4ca-307e56249b5mr16057921fa.0.1738960892192; Fri, 07 Feb 2025 12:41:32 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307de178628sm5343811fa.10.2025.02.07.12.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 12:41:31 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 07 Feb 2025 22:41:19 +0200 Subject: [PATCH v4 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: <20250207-rb1-bt-v4-5-d810fc8c94a9@linaro.org> References: <20250207-rb1-bt-v4-0-d810fc8c94a9@linaro.org> In-Reply-To: <20250207-rb1-bt-v4-0-d810fc8c94a9@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/pANAwAKAYs8ij4CKSjVAcsmYgBnpm/ujW9HyGLt8g9r8KYeBGvBPzJCLQA6GIBM0 F5rhO2oy9yJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6Zv7gAKCRCLPIo+Aiko 1aInCACdLbRGZMZ1qluRxcZdmHdIo85b7zTs9sSmlNzHctqHpE1ZjdGHk8cepvMmTCoMuWZpbeu rnMO9+8Q0MECLgV7ImZPbDYxudbJySRSDawCTUP1kPPwVVX387tsvK0nkV1M3HOcF9jfWQOEFWL Q7gor3l8DABVRtFj2QJoGMSeTVLFubca0mXphiWnN4ZeTFyDBnIq4atPOpRLvKObAKc83zg+4rR /Q1kY+mtinwxcxcZFR77ZnjSSn+lkQPy34gayvbKpup6VQwbg8bcCTmmrBVsqM/hiKa1mVTKddu 6/ree3ZIYjQ4GBQI14QB4ZTJmY7i7ikGs8PjPnijLOl/Nc/j 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 Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qc= om/qcm2290.dtsi index 6e3e57dd02612f3568f07f1e198028413f463c69..30e9bb6c1679aab13c3f3f7f645= 5f2483b2ba0c5 100644 --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi @@ -1239,6 +1239,21 @@ &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, status =3D "disabled"; }; =20 + uart3: serial@4a8c000 { + compatible =3D "qcom,geni-uart"; + reg =3D <0x0 0x04a8c000 0x0 0x4000>; + interrupts =3D ; + clocks =3D <&gcc GCC_QUPV3_WRAP0_S3_CLK>; + clock-names =3D "se"; + interconnects =3D <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG + &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, + <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; + interconnect-names =3D "qup-core", + "qup-config"; + status =3D "disabled"; + }; + i2c4: i2c@4a90000 { compatible =3D "qcom,geni-i2c"; reg =3D <0x0 0x04a90000 0x0 0x4000>; --=20 2.39.5 From nobody Fri Dec 19 04:00:26 2025 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 667E31DB14C for ; Fri, 7 Feb 2025 20:41:36 +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=1738960898; cv=none; b=dmOGjNJ+yM6l+sbxIAb2HyciB8fjmvzcFvQMB4tC/Qat3dTGzw3u6YZvCUYfOJ8gDQUaY05NRNKsVm9qOQhuROkmnDfE9K23z3a1NWupRj8mqOPyGAXahZVZeBC07jKKD2IyGaSyYXZ2//zZLzwya+IKsjepMPtTen6a1DhUGxg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960898; c=relaxed/simple; bh=nvBn7R4zl24lXF8bRo2NYM4At9i0z38sCJ0Oi1zDsD0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jAAF5uuMu0Ut08HrfEabVrSwOZbWqJVbWocKeEhlFKMkUHMP3Xmza5fxZSTv9KHG1EDp4cpFq7VufdMO6f2HCdIvKgy3RCcEMRIQRvcH+GLY06wiI/LmLD6csyaRMBeyDf1QHjoDYg4os634mzAM5EdSR45d5VTq3l2elgiIvKE= 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=jBpLuFpi; 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="jBpLuFpi" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-30613802a04so26543491fa.2 for ; Fri, 07 Feb 2025 12:41:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738960894; x=1739565694; 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=a8UJbddvLQG9wXJNzynWa7omOtgBQR2Tq8dAU0qNTtA=; b=jBpLuFpi8awAQFehuVzFwx0neQzYX+5yQzbo+BH9RBWVpP9Q2sPkPHGy7WmdS6+MgE LNWGmYyCXUsr7vD3oT7eAbRcufx6H+IMP2s7FTXJ/MZIfTWCsfOGLSf63BgDDOghPcy3 HgbwlG95W/5ZFgngvHES+ebLwf06g+orrHPZ5Sd80RcZ8B1OxVbqVdKBbAMFGSkVnZ9A ipc5n5gsF+gOwsJmdypd/LbqW8R2hms3p8UXF3y0FWtOtpb9WhV6NdsW+0Ayll5daeff goj3EadKUYK1jV9GK3Db79CvczAlMUHWLYtjKyN50C75uyLk6p3gaolOu1SENC3UhFMW rDdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738960894; x=1739565694; 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=a8UJbddvLQG9wXJNzynWa7omOtgBQR2Tq8dAU0qNTtA=; b=GryzXfDgjUHwSq7tF4wY3HAepO5XoqEzY+NdaoZWWup8K5cLdOwKBR0wztDwF3I4FB uxJOWs05otNpscA19FxsEHb+tzgXQIZCr5hWmXQ+zznQTH+Za0SK6+Msisc65WP3z0N+ lwfSfyk6Kep8d+64YxZqWlb4Orlvjer1sPzkbIsqyI2xCO/CqoO9BydcIGT2y4VdJrBO g7Qc7PvFrjA9kcPG62EEb/x0CT18UsfYcmzWJDq0n8euzvdz/YZwTVDF0HIt8+dpShJE 3Q/LmIyTWsuAnPPrseighUsPhiUvVQ5DvzOLYhMmHyJwxS9/7Fa+aKYKXP7Yz0l0nT1q AXKw== X-Forwarded-Encrypted: i=1; AJvYcCVttqdX0KmhOapm8/awGle7CSKYzoZtBz7EMgIgE+6pKAygzOA5aaPWbtrd4TsnauuPnvTNA2yQ1EJKPQ8=@vger.kernel.org X-Gm-Message-State: AOJu0YwOUsDuVdBdnZ4csd1eTD1aIC5Goruf3wfN/GntRKFa6RD5ePOh HLE+cCRD9gEpYMO1DLptCrghWvDtSbUH89mERKMg4Iqzl7T3gNC6/GWTAKrCDcc= X-Gm-Gg: ASbGncv+y/WP5FlOZAPWirTQDrKgb4HTq6pgUnd6wmUe8o+ZO5TZWuh+0rzfQBQfmKJ sumRZAUk5RSLsQxdAHZ2DryyzZ0p45h+ECriP2efgkLWLsuf2zdImY4Ay0e2rqDCvdKA9psnM58 +J2+QeaQPtsq98DZatuHFji9nphRs3UQwOrK55TVodAymIvqcidUiHVcpeHZxhS5pVGvh1Hir/t /E2bx7Tzr2NNC2k0iAfSJqJLJnhP4DY7KO156KzSIYZMZwUitWuzUO0jUS5363Npg5E+lc6Rcqd 13wZJ0IvfmKcMeOOYiAfM0I= X-Google-Smtp-Source: AGHT+IE+PEeFY+/fGE/0oTDa+1Oyc89e2djwYGmCFITdkpFlLgeM+hJaVdYS05brkuhQo+y4hh2GcQ== X-Received: by 2002:a2e:b8c6:0:b0:302:175e:5abb with SMTP id 38308e7fff4ca-307e57ce521mr12024031fa.3.1738960894523; Fri, 07 Feb 2025 12:41:34 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307de178628sm5343811fa.10.2025.02.07.12.41.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 12:41:33 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 07 Feb 2025 22:41:20 +0200 Subject: [PATCH v4 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: <20250207-rb1-bt-v4-6-d810fc8c94a9@linaro.org> References: <20250207-rb1-bt-v4-0-d810fc8c94a9@linaro.org> In-Reply-To: <20250207-rb1-bt-v4-0-d810fc8c94a9@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, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3166; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=nvBn7R4zl24lXF8bRo2NYM4At9i0z38sCJ0Oi1zDsD0=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnpm/ubXRilr+k7yK/Z4ZjyxXCNNia7uDidNpQ8 sX5SOfx5zmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6Zv7gAKCRCLPIo+Aiko 1WrwB/9oYqO4kJTo5HFANYeTOnbkNfsQhepHwUbzzOqYGYqpxQVZmBr8VToM1SAv0sizF0vxQTs XRm+qgA1PS9ecw0ruoBWfz7wjB/8Mv45Y2X1RFcLfpwAhtkUlGM9Wz9ceZvmN9uC9DOtS+3TrEh YqfaTatOhHYtB85pc6buQE/BBrEmT9XcoF1r5+JI/n0QmKdvxAZDBLy+nDNYuvVIqWBy7q5HAZT zLD5FSrzKDxRSPlegfdbm7RJWcoPbjosqd2E9YJCh2uOPOgsK71vLTZsGn1nI631SnNIPytZS3x GyHI/Qz4fFFZA2FBmRdktbJdfRS5x+Y7hgMpnaY5qoc7lleC 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 Reviewed-by: Krzysztof Kozlowski Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 83 ++++++++++++++++++++++++++++= ++++ 1 file changed, 83 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts b/arch/arm64/boot/dts= /qcom/qrb2210-rb1.dts index 7a789b41c2f1887f0c41ae24da2e2fe8915ab13c..9a2c86144ed529f13987b413540= 7f605b9ec71cd 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,28 @@ 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