* [PATCH 2/5] arm64: dts: qcom: sdm845-mtp: specify wifi variant
2023-08-25 22:08 [PATCH 1/5] arm64: dts: qcom: sdm845-mtp: fix WiFi configuration Dmitry Baryshkov
@ 2023-08-25 22:08 ` Dmitry Baryshkov
2023-08-25 22:08 ` [PATCH 3/5] arm64: dts: qcom: sdm845-mtp: switch to mbn firmware Dmitry Baryshkov
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Dmitry Baryshkov @ 2023-08-25 22:08 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
Specify the variant for the WiFi BDF file, "Qualcomm_sdm845mtp" to ease
distinguishing from other (possible) devices using the same board id.
For the reference:
ath10k_snoc 18800000.wifi: qmi chip_id 0x30214 chip_family 0x4001 board_id 0x3f soc_id 0x40030001
ath10k_snoc 18800000.wifi: qmi fw_version 0x2009856b fw_build_timestamp 2018-07-19 12:28 fw_build_id QC_IMAGE_VERSION_STRING=WLAN.HL.2.0-01387-QCAHLSWMTPLZ-1
ath10k_snoc 18800000.wifi: failed to fetch board data for bus=snoc,qmi-board-id=3f,qmi-chip-id=30214,variant=Qualcomm_sdm845mtp from ath10k/WCN3990/hw1.0/board-2.bin
ath10k_snoc 18800000.wifi: wcn3990 hw1.0 target 0x00000008 chip_id 0x00000000 sub 0000:0000
ath10k_snoc 18800000.wifi: kconfig debug 1 debugfs 0 tracing 0 dfs 0 testmode 0
ath10k_snoc 18800000.wifi: firmware ver api 5 features wowlan,mgmt-tx-by-reference,non-bmi crc32 b3d4b790
ath10k_snoc 18800000.wifi: htt-ver 3.53 wmi-op 4 htt-op 3 cal file max-sta 32 raw 0 hwcrypto 1
ath10k_snoc 18800000.wifi: invalid MAC address; choosing random
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index 1516113391ed..56f5bf52d9bd 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -718,6 +718,7 @@ &wifi {
vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
qcom,snoc-host-cap-8bit-quirk;
+ qcom,ath10k-calibration-variant = "Qualcomm_sdm845mtp";
};
/* PINCTRL - additions to nodes defined in sdm845.dtsi */
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/5] arm64: dts: qcom: sdm845-mtp: switch to mbn firmware
2023-08-25 22:08 [PATCH 1/5] arm64: dts: qcom: sdm845-mtp: fix WiFi configuration Dmitry Baryshkov
2023-08-25 22:08 ` [PATCH 2/5] arm64: dts: qcom: sdm845-mtp: specify wifi variant Dmitry Baryshkov
@ 2023-08-25 22:08 ` Dmitry Baryshkov
2023-08-26 9:00 ` Konrad Dybcio
2023-08-25 22:08 ` [PATCH 4/5] arm64: dts: qcom: sdm845-mtp: enable Vol-/reset button Dmitry Baryshkov
2023-08-25 22:08 ` [PATCH 5/5] arm64: dts: qcom: sdm845-mtp: enable PCIe support Dmitry Baryshkov
3 siblings, 1 reply; 10+ messages in thread
From: Dmitry Baryshkov @ 2023-08-25 22:08 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
We have switched most of devices to use mbn (squashed) firmware files
instead of spit mdt+bNN. Even this DT uses modem.mbn and a630_zap.mbn.
Let's switch adsp and cdsp firmware files to use .mbn format too.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index 56f5bf52d9bd..7579ba66c6d8 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -114,7 +114,7 @@ trip-point {
&adsp_pas {
status = "okay";
- firmware-name = "qcom/sdm845/adsp.mdt";
+ firmware-name = "qcom/sdm845/adsp.mbn";
};
&apps_rsc {
@@ -415,7 +415,7 @@ vreg_s3c_0p6: smps3 {
&cdsp_pas {
status = "okay";
- firmware-name = "qcom/sdm845/cdsp.mdt";
+ firmware-name = "qcom/sdm845/cdsp.mbn";
};
&gcc {
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 3/5] arm64: dts: qcom: sdm845-mtp: switch to mbn firmware
2023-08-25 22:08 ` [PATCH 3/5] arm64: dts: qcom: sdm845-mtp: switch to mbn firmware Dmitry Baryshkov
@ 2023-08-26 9:00 ` Konrad Dybcio
2023-08-26 13:57 ` Dmitry Baryshkov
0 siblings, 1 reply; 10+ messages in thread
From: Konrad Dybcio @ 2023-08-26 9:00 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 26.08.2023 00:08, Dmitry Baryshkov wrote:
> We have switched most of devices to use mbn (squashed) firmware files
> instead of spit mdt+bNN. Even this DT uses modem.mbn and a630_zap.mbn.
> Let's switch adsp and cdsp firmware files to use .mbn format too.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Looks like 845 was mbn from the start
https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/qcom/sdm845?qt=grep&q=
> arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> index 56f5bf52d9bd..7579ba66c6d8 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> @@ -114,7 +114,7 @@ trip-point {
>
> &adsp_pas {
> status = "okay";
> - firmware-name = "qcom/sdm845/adsp.mdt";
> + firmware-name = "qcom/sdm845/adsp.mbn";
> };
>
> &apps_rsc {
> @@ -415,7 +415,7 @@ vreg_s3c_0p6: smps3 {
>
> &cdsp_pas {
> status = "okay";
> - firmware-name = "qcom/sdm845/cdsp.mdt";
> + firmware-name = "qcom/sdm845/cdsp.mbn";
> };
>
> &gcc {
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 3/5] arm64: dts: qcom: sdm845-mtp: switch to mbn firmware
2023-08-26 9:00 ` Konrad Dybcio
@ 2023-08-26 13:57 ` Dmitry Baryshkov
2023-08-26 14:01 ` Konrad Dybcio
0 siblings, 1 reply; 10+ messages in thread
From: Dmitry Baryshkov @ 2023-08-26 13:57 UTC (permalink / raw)
To: Konrad Dybcio
Cc: Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski,
linux-arm-msm, devicetree
On Sat, 26 Aug 2023 at 12:00, Konrad Dybcio <konrad.dybcio@linaro.org> wrote:
>
> On 26.08.2023 00:08, Dmitry Baryshkov wrote:
> > We have switched most of devices to use mbn (squashed) firmware files
> > instead of spit mdt+bNN. Even this DT uses modem.mbn and a630_zap.mbn.
> > Let's switch adsp and cdsp firmware files to use .mbn format too.
> >
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > ---
> Looks like 845 was mbn from the start
>
> https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/qcom/sdm845?qt=grep&q=
sdm845-mtp predates these files. So is there an r-b?
> > arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> > index 56f5bf52d9bd..7579ba66c6d8 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> > +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> > @@ -114,7 +114,7 @@ trip-point {
> >
> > &adsp_pas {
> > status = "okay";
> > - firmware-name = "qcom/sdm845/adsp.mdt";
> > + firmware-name = "qcom/sdm845/adsp.mbn";
> > };
> >
> > &apps_rsc {
> > @@ -415,7 +415,7 @@ vreg_s3c_0p6: smps3 {
> >
> > &cdsp_pas {
> > status = "okay";
> > - firmware-name = "qcom/sdm845/cdsp.mdt";
> > + firmware-name = "qcom/sdm845/cdsp.mbn";
> > };
> >
> > &gcc {
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 3/5] arm64: dts: qcom: sdm845-mtp: switch to mbn firmware
2023-08-26 13:57 ` Dmitry Baryshkov
@ 2023-08-26 14:01 ` Konrad Dybcio
0 siblings, 0 replies; 10+ messages in thread
From: Konrad Dybcio @ 2023-08-26 14:01 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski,
linux-arm-msm, devicetree
On 26.08.2023 15:57, Dmitry Baryshkov wrote:
> On Sat, 26 Aug 2023 at 12:00, Konrad Dybcio <konrad.dybcio@linaro.org> wrote:
>>
>> On 26.08.2023 00:08, Dmitry Baryshkov wrote:
>>> We have switched most of devices to use mbn (squashed) firmware files
>>> instead of spit mdt+bNN. Even this DT uses modem.mbn and a630_zap.mbn.
>>> Let's switch adsp and cdsp firmware files to use .mbn format too.
>>>
>>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>>> ---
>> Looks like 845 was mbn from the start
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/qcom/sdm845?qt=grep&q=
>
> sdm845-mtp predates these files. So is there an r-b?
Yes, I hit enter too fast
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 4/5] arm64: dts: qcom: sdm845-mtp: enable Vol-/reset button
2023-08-25 22:08 [PATCH 1/5] arm64: dts: qcom: sdm845-mtp: fix WiFi configuration Dmitry Baryshkov
2023-08-25 22:08 ` [PATCH 2/5] arm64: dts: qcom: sdm845-mtp: specify wifi variant Dmitry Baryshkov
2023-08-25 22:08 ` [PATCH 3/5] arm64: dts: qcom: sdm845-mtp: switch to mbn firmware Dmitry Baryshkov
@ 2023-08-25 22:08 ` Dmitry Baryshkov
2023-08-26 9:01 ` Konrad Dybcio
2023-08-25 22:08 ` [PATCH 5/5] arm64: dts: qcom: sdm845-mtp: enable PCIe support Dmitry Baryshkov
3 siblings, 1 reply; 10+ messages in thread
From: Dmitry Baryshkov @ 2023-08-25 22:08 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
Wire up the Vol- / reset button on Qualcomm SDM845 MTP board.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index 7579ba66c6d8..aec3f358d426 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -609,6 +609,11 @@ quiet-thermistor@4 {
};
};
+&pm8998_resin {
+ linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
+};
+
&qupv3_id_1 {
status = "okay";
};
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/5] arm64: dts: qcom: sdm845-mtp: enable PCIe support
2023-08-25 22:08 [PATCH 1/5] arm64: dts: qcom: sdm845-mtp: fix WiFi configuration Dmitry Baryshkov
` (2 preceding siblings ...)
2023-08-25 22:08 ` [PATCH 4/5] arm64: dts: qcom: sdm845-mtp: enable Vol-/reset button Dmitry Baryshkov
@ 2023-08-25 22:08 ` Dmitry Baryshkov
2023-08-26 9:02 ` Konrad Dybcio
3 siblings, 1 reply; 10+ messages in thread
From: Dmitry Baryshkov @ 2023-08-25 22:08 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
Enable two PCIe hosts support on Qualcomm SDM845 MTP board.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 81 +++++++++++++++++++++++++
1 file changed, 81 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index aec3f358d426..9fb41d2453c8 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -533,6 +533,36 @@ &mss_pil {
firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mbn";
};
+&pcie0 {
+ status = "okay";
+ perst-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pcie0_default_state>;
+};
+
+&pcie0_phy {
+ status = "okay";
+
+ vdda-phy-supply = <&vreg_l1a_0p875>;
+ vdda-pll-supply = <&vreg_l26a_1p2>;
+};
+
+&pcie1 {
+ status = "okay";
+ perst-gpios = <&tlmm 102 GPIO_ACTIVE_LOW>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pcie1_default_state>;
+};
+
+&pcie1_phy {
+ status = "okay";
+
+ vdda-phy-supply = <&vreg_l1a_0p875>;
+ vdda-pll-supply = <&vreg_l26a_1p2>;
+};
+
&pm8998_adc {
channel@4c {
reg = <ADC5_XO_THERM_100K_PU>;
@@ -630,6 +660,57 @@ &sdhc_2 {
cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>;
};
+&tlmm {
+ pcie0_default_state: pcie0-default-state {
+ clkreq-pins {
+ pins = "gpio36";
+ function = "pci_e0";
+ bias-pull-up;
+ };
+
+ perst-n-pins {
+ pins = "gpio35";
+ function = "gpio";
+
+ drive-strength = <2>;
+ output-low;
+ bias-pull-down;
+ };
+
+ wake-n-pins {
+ pins = "gpio37";
+ function = "gpio";
+
+ drive-strength = <2>;
+ bias-pull-up;
+ };
+ };
+
+ pcie1_default_state: pcie1-default-state {
+ clkreq-pins {
+ pins = "gpio103";
+ function = "pci_e1";
+ bias-pull-up;
+ };
+
+ perst-n-pins {
+ pins = "gpio102";
+ function = "gpio";
+
+ drive-strength = <16>;
+ bias-disable;
+ };
+
+ wake-n-pins {
+ pins = "gpio104";
+ function = "gpio";
+
+ drive-strength = <2>;
+ bias-pull-up;
+ };
+ };
+};
+
&uart9 {
status = "okay";
};
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 5/5] arm64: dts: qcom: sdm845-mtp: enable PCIe support
2023-08-25 22:08 ` [PATCH 5/5] arm64: dts: qcom: sdm845-mtp: enable PCIe support Dmitry Baryshkov
@ 2023-08-26 9:02 ` Konrad Dybcio
0 siblings, 0 replies; 10+ messages in thread
From: Konrad Dybcio @ 2023-08-26 9:02 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 26.08.2023 00:08, Dmitry Baryshkov wrote:
> Enable two PCIe hosts support on Qualcomm SDM845 MTP board.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
> arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 81 +++++++++++++++++++++++++
> 1 file changed, 81 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> index aec3f358d426..9fb41d2453c8 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> @@ -533,6 +533,36 @@ &mss_pil {
> firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mbn";
> };
>
> +&pcie0 {
> + status = "okay";
last
> + perst-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie0_default_state>;
flip
[...]
> + pcie0_default_state: pcie0-default-state {
> + clkreq-pins {
> + pins = "gpio36";
> + function = "pci_e0";
> + bias-pull-up;
> + };
> +
> + perst-n-pins {
> + pins = "gpio35";
> + function = "gpio";
> +
> + drive-strength = <2>;
drop newline
> + output-low;
> + bias-pull-down;
flip
Konrad
^ permalink raw reply [flat|nested] 10+ messages in thread