[PATCH 0/4] arm64: dts: qcom: qcs6490-rb3gen2: several small fixes

[PATCH 0/4] arm64: dts: qcom: qcs6490-rb3gen2: several small fixes

[Dmitry Baryshkov]

- use modem.mbn instead of modem.mdt
- make GPU disabled by default
- specifiy ZAP blobs
- enable WiFi devices

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Dmitry Baryshkov (4):
      arm64: dts: qcom: qcs6390-rb3gen2: use modem.mbn for modem DSP
      arm64: dts: qcom: sc7280: don't enable GPU on unsupported devices
      arm64: dts: qcom: qcm6490-idp: enable WiFi
      arm64: dts: qcom: qcm6490-rb3gen2: enable WiFi

 arch/arm64/boot/dts/qcom/qcm6490-idp.dts           | 11 +++++++++++
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts       | 13 ++++++++++++-
 arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi |  4 ++++
 arch/arm64/boot/dts/qcom/sc7280.dtsi               |  2 ++
 4 files changed, 29 insertions(+), 1 deletion(-)
---
base-commit: c7d810a304e6ed8bbf3a09716ae3827fa185d2b1
change-id: 20240907-rb3g2-fixes-74a74204e88b

Best regards,
-- 
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

[PATCH 1/4] arm64: dts: qcom: qcs6390-rb3gen2: use modem.mbn for modem DSP

[Dmitry Baryshkov]

Newer boards should always use squashed MBN firmware instead of split
MDT+bNN. Use qcom/qcs6490/modem.mbn as the firmware for the modem on
RB3gen2.

Fixes: ac6d35b9b74c ("arm64: dts: qcom: qcs6490-rb3gen2: Enable various remoteprocs")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 0d45662b8028..5d0167fbc709 100644
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -707,7 +707,7 @@ &remoteproc_cdsp {
 };
 
 &remoteproc_mpss {
-	firmware-name = "qcom/qcs6490/modem.mdt";
+	firmware-name = "qcom/qcs6490/modem.mbn";
 	status = "okay";
 };
 

-- 
2.39.2

[PATCH 2/4] arm64: dts: qcom: sc7280: don't enable GPU on unsupported devices

[Dmitry Baryshkov]

On SC7280 and derivative platforms GPU by default requires a signed
binary, a660_zap.mbn. Disable GPU by default and enable it only when
the binary is actually available (QCM6490-IDP, RB3gen2). ChromeOS
devices do not use TrustZone, so GPU can be enabled by default in
sc7280-chrome-common.dtsi. FairPhone5 and SHIFTphone8 DTS already
enable GPU (even though it wasn't required beforehand).

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/qcm6490-idp.dts           | 8 ++++++++
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts       | 8 ++++++++
 arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 4 ++++
 arch/arm64/boot/dts/qcom/sc7280.dtsi               | 2 ++
 4 files changed, 22 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
index 84c45419cb8d..c4cfafb3ec15 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
@@ -499,6 +499,14 @@ vreg_bob_3p296: bob {
 	};
 };
 
+&gpu {
+	status = "okay";
+};
+
+&gpu_zap_shader {
+	firmware-name = "qcom/qcm6490/a660_zap.mbn";
+};
+
 &mdss {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 5d0167fbc709..00b755779608 100644
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -557,6 +557,14 @@ &gpi_dma1 {
 	status = "okay";
 };
 
+&gpu {
+	status = "okay";
+};
+
+&gpu_zap_shader {
+	firmware-name = "qcom/qcs6490/a660_zap.mbn";
+};
+
 &i2c0 {
 	clock-frequency = <400000>;
 	status = "okay";
diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
index cecb3e89f7f7..eb5e32035d93 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
@@ -56,6 +56,10 @@ &CLUSTER_PD {
 	domain-idle-states = <&CLUSTER_SLEEP_0>;
 };
 
+&gpu {
+	status = "okay";
+};
+
 &lpass_aon {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 3d8410683402..fbdc9c19242c 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -2823,6 +2823,8 @@ gpu: gpu@3d00000 {
 			nvmem-cells = <&gpu_speed_bin>;
 			nvmem-cell-names = "speed_bin";
 
+			status = "disabled";
+
 			gpu_zap_shader: zap-shader {
 				memory-region = <&gpu_zap_mem>;
 			};

-- 
2.39.2

[PATCH 3/4] arm64: dts: qcom: qcm6490-idp: enable WiFi

[Dmitry Baryshkov]

Enable WiFi device and specify the calibration variant name on the
QCM6490 IDP device.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Cc: ath11k@lists.infradead.org
Cc: Kalle Valo <kvalo@kernel.org>
---
 arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
index c4cfafb3ec15..5f3d4807ac43 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
@@ -728,4 +728,7 @@ &usb_1_qmpphy {
 
 &wifi {
 	memory-region = <&wlan_fw_mem>;
+	qcom,ath11k-calibration-variant = "Qualcomm_qcm6490idp";
+
+	status = "okay";
 };

-- 
2.39.2

[PATCH 4/4] arm64: dts: qcom: qcm6490-rb3gen2: enable WiFi

[Dmitry Baryshkov]

Enable WiFi device and specify the calibration variant name on the
RB3gen2 device.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Cc: ath11k@lists.infradead.org
Cc: Kalle Valo <kvalo@kernel.org>
---
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 00b755779608..41d800e09638 100644
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -800,6 +800,9 @@ &ufs_mem_phy {
 
 &wifi {
 	memory-region = <&wlan_fw_mem>;
+	qcom,ath11k-calibration-variant = "Qualcomm_rb3gen2";
+
+	status = "okay";
 };
 
 /* PINCTRL - ADDITIONS TO NODES IN PARENT DEVICE TREE FILES */

-- 
2.39.2

Re: [PATCH 1/4] arm64: dts: qcom: qcs6390-rb3gen2: use modem.mbn for modem DSP

[Konrad Dybcio]

On 7.09.2024 2:51 PM, Dmitry Baryshkov wrote:
> Newer boards should always use squashed MBN firmware instead of split
> MDT+bNN. Use qcom/qcs6490/modem.mbn as the firmware for the modem on
> RB3gen2.
> 
> Fixes: ac6d35b9b74c ("arm64: dts: qcom: qcs6490-rb3gen2: Enable various remoteprocs")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Konrad Dybcio <konradybcio@kernel.org>

Konrad

Re: [PATCH 2/4] arm64: dts: qcom: sc7280: don't enable GPU on unsupported devices

[Konrad Dybcio]

On 7.09.2024 2:51 PM, Dmitry Baryshkov wrote:
> On SC7280 and derivative platforms GPU by default requires a signed
> binary, a660_zap.mbn. Disable GPU by default and enable it only when
> the binary is actually available (QCM6490-IDP, RB3gen2). ChromeOS
> devices do not use TrustZone, so GPU can be enabled by default in
> sc7280-chrome-common.dtsi. FairPhone5 and SHIFTphone8 DTS already
> enable GPU (even though it wasn't required beforehand).
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Konrad Dybcio <konradybcio@kernel.org>

Konrad

Re: [PATCH 0/4] arm64: dts: qcom: qcs6490-rb3gen2: several small fixes

[Bjorn Andersson]

On Sat, 07 Sep 2024 15:51:23 +0300, Dmitry Baryshkov wrote:
> - use modem.mbn instead of modem.mdt
> - make GPU disabled by default
> - specifiy ZAP blobs
> - enable WiFi devices
> 
> 

Applied, thanks!

[1/4] arm64: dts: qcom: qcs6390-rb3gen2: use modem.mbn for modem DSP
      commit: 6317aad0e1525f3e3609d9a0fea762a37799943a
[2/4] arm64: dts: qcom: sc7280: don't enable GPU on unsupported devices
      commit: 94d5ffab9d5ebc9caeab310f9d2eb36a65d7d3a9
[3/4] arm64: dts: qcom: qcm6490-idp: enable WiFi
      commit: afa11181fa506709857ebbdd17b4d76f2587e802
[4/4] arm64: dts: qcom: qcm6490-rb3gen2: enable WiFi
      commit: 0f6c6ae2e9d1cfafe62fed9ca0a07d241d3d8b79

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>