[PATCH 0/4] SM6375 features

[PATCH 0/4] SM6375 features

[Konrad Dybcio]

Enable modem & wifi on sony 10 IV, add bt uart to the soc dt.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
Konrad Dybcio (4):
      arm64: dts: qcom: sm6375: Add UART1
      arm64: dts: qcom: sm6375-pdx225: Enable MSS
      arm64: dts: qcom: sm6375-pdx225: Enable ATH10K WiFi
      arm64: dts: qcom: sm6375-pdx225: Add USBPHY regulators

 .../dts/qcom/sm6375-sony-xperia-murray-pdx225.dts  | 29 ++++++++++++---
 arch/arm64/boot/dts/qcom/sm6375.dtsi               | 43 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 6 deletions(-)
---
base-commit: 18030226a48de1fbfabf4ae16aaa2695a484254f
change-id: 20230927-topic-6375_stuff-a24df562dae7

Best regards,
-- 
Konrad Dybcio <konrad.dybcio@linaro.org>

[PATCH 1/4] arm64: dts: qcom: sm6375: Add UART1

[Konrad Dybcio]

Add UART1 node, generally used for the Bluetooth module.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm6375.dtsi | 43 ++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm6375.dtsi b/arch/arm64/boot/dts/qcom/sm6375.dtsi
index e7ff55443da7..2fba0e7ea4e6 100644
--- a/arch/arm64/boot/dts/qcom/sm6375.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6375.dtsi
@@ -896,6 +896,36 @@ qup_spi0_default: qup-spi0-default-state {
 				drive-strength = <6>;
 				bias-disable;
 			};
+
+			qup_uart1_default: qup-uart1-default-state {
+				cts-pins {
+					pins = "gpio61";
+					function = "qup01";
+					drive-strength = <2>;
+					bias-pull-down;
+				};
+
+				rts-pins {
+					pins = "gpio62";
+					function = "qup01";
+					drive-strength = <2>;
+					bias-disable;
+				};
+
+				tx-pins {
+					pins = "gpio63";
+					function = "qup01";
+					drive-strength = <2>;
+					bias-disable;
+				};
+
+				rx-pins {
+					pins = "gpio64";
+					function = "qup01";
+					drive-strength = <2>;
+					bias-pull-up;
+				};
+			};
 		};
 
 		gcc: clock-controller@1400000 {
@@ -1111,6 +1141,19 @@ spi1: spi@4a84000 {
 				status = "disabled";
 			};
 
+			uart1: serial@4a84000 {
+				compatible = "qcom,geni-uart";
+				reg = <0x0 0x04a84000 0x0 0x4000>;
+				interrupts = <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&gcc GCC_QUPV3_WRAP0_S1_CLK>;
+				clock-names = "se";
+				power-domains = <&rpmpd SM6375_VDDCX>;
+				operating-points-v2 = <&qup_opp_table>;
+				pinctrl-0 = <&qup_uart1_default>;
+				pinctrl-names = "default";
+				status = "disabled";
+			};
+
 			i2c2: i2c@4a88000 {
 				compatible = "qcom,geni-i2c";
 				reg = <0x0 0x04a88000 0x0 0x4000>;

-- 
2.42.0

[PATCH 2/4] arm64: dts: qcom: sm6375-pdx225: Enable MSS

[Konrad Dybcio]

Enable the 5G modem on the Sony Xperia 10 IV.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
index b2f1bb1d58e9..964fe86a18ef 100644
--- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
+++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
@@ -187,6 +187,11 @@ &remoteproc_cdsp {
 	status = "okay";
 };
 
+&remoteproc_mss {
+	firmware-name = "qcom/sm6375/Sony/murray/modem.mbn";
+	status = "okay";
+};
+
 &rpm_requests {
 	regulators-0 {
 		compatible = "qcom,rpm-pm6125-regulators";

-- 
2.42.0

[PATCH 3/4] arm64: dts: qcom: sm6375-pdx225: Enable ATH10K WiFi

[Konrad Dybcio]

Enable the onboard QCA Wi-Fi. HW identifiers for reference:
qmi chip_id 0x320 chip_family 0x4001 board_id 0xff soc_id 0x400e0000

Firmware sources:
/vendor/firmware_mnt/image/wlanmdsp.bin -> qcom/.../wlanmdsp.mbn
/vendor/firmware_mnt/image/bdwlan.bXX [1] -> [2] -> ath10k/.../board-2.bin
[3] -> ath10k/.../firmware-5.bin

Not sure where 3 comes from on the device itself, gotta investigate that..

According to [4], it's called WCN3990_STRAIT.

Enable it and tighten the relevant regulators.

[1] XX = board_id printed when the file is missing or by your downstream
    kernel firmware loader in the dmesg; if XX=ff, use bdwlan.bin

[2] https://github.com/jhugo/linux/blob/5.5rc2_wifi/README
[3] https://github.com/kvalo/ath10k-firmware/blob/master/WCN3990/hw1.0/HL3.1/WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1/firmware-5.bin
[4] https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn/-/blob/LA.VENDOR.1.0.r1-20700-WAIPIO.QSSI13.0/hif/src/hif_hw_version.h#L55

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 .../boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
index 964fe86a18ef..bbec7aee60be 100644
--- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
+++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
@@ -311,7 +311,7 @@ pm6125_l20: l20 {
 
 		pm6125_l21: l21 {
 			regulator-min-microvolt = <3000000>;
-			regulator-max-microvolt = <3400000>;
+			regulator-max-microvolt = <3312000>;
 		};
 
 		pm6125_l22: l22 {
@@ -322,7 +322,7 @@ pm6125_l22: l22 {
 
 		pm6125_l23: l23 {
 			regulator-min-microvolt = <3000000>;
-			regulator-max-microvolt = <3400000>;
+			regulator-max-microvolt = <3312000>;
 		};
 
 		pm6125_l24: l24 {
@@ -345,8 +345,8 @@ pmr735a_l1: l1 {
 		};
 
 		pmr735a_l2: l2 {
-			regulator-min-microvolt = <352000>;
-			regulator-max-microvolt = <796000>;
+			regulator-min-microvolt = <640000>;
+			regulator-max-microvolt = <640000>;
 		};
 
 		pmr735a_l3: l3 {
@@ -433,6 +433,15 @@ &usb_1_hsphy {
 	status = "okay";
 };
 
+&wifi {
+	vdd-0.8-cx-mx-supply = <&pmr735a_l2>;
+	vdd-1.8-xo-supply = <&pm6125_l16>;
+	vdd-1.3-rfa-supply = <&pm6125_l2>;
+	vdd-3.3-ch0-supply = <&pm6125_l23>;
+	vdd-3.3-ch1-supply = <&pm6125_l21>;
+	status = "okay";
+};
+
 &xo_board_clk {
 	clock-frequency = <19200000>;
 };

-- 
2.42.0

[PATCH 4/4] arm64: dts: qcom: sm6375-pdx225: Add USBPHY regulators

[Konrad Dybcio]

To make dtbs_check happy and the software more aware of what's going
on, describe the HSUSB PHY's regulators and tighten up VDDA_PLL to match.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
index bbec7aee60be..0ce4fa8de8b0 100644
--- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
+++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
@@ -243,8 +243,8 @@ pm6125_l6: l6 {
 		};
 
 		pm6125_l7: l7 {
-			regulator-min-microvolt = <720000>;
-			regulator-max-microvolt = <1050000>;
+			regulator-min-microvolt = <880000>;
+			regulator-max-microvolt = <880000>;
 		};
 
 		pm6125_l8: l8 {
@@ -430,6 +430,9 @@ &usb_1_dwc3 {
 };
 
 &usb_1_hsphy {
+	vdda-pll-supply = <&pm6125_l7>;
+	vdda18-supply = <&pm6125_l10>;
+	vdda33-supply = <&pmr735a_l7>;
 	status = "okay";
 };
 

-- 
2.42.0

Re: [PATCH 1/4] arm64: dts: qcom: sm6375: Add UART1

[Bryan O'Donoghue]

On 27/09/2023 10:21, Konrad Dybcio wrote:
> Add UART1 node, generally used for the Bluetooth module.
> 
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---
>   arch/arm64/boot/dts/qcom/sm6375.dtsi | 43 ++++++++++++++++++++++++++++++++++++
>   1 file changed, 43 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm6375.dtsi b/arch/arm64/boot/dts/qcom/sm6375.dtsi
> index e7ff55443da7..2fba0e7ea4e6 100644
> --- a/arch/arm64/boot/dts/qcom/sm6375.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm6375.dtsi
> @@ -896,6 +896,36 @@ qup_spi0_default: qup-spi0-default-state {
>   				drive-strength = <6>;
>   				bias-disable;
>   			};
> +
> +			qup_uart1_default: qup-uart1-default-state {
> +				cts-pins {
> +					pins = "gpio61";
> +					function = "qup01";
> +					drive-strength = <2>;
> +					bias-pull-down;
> +				};

Any particular reason you are doing bias-pull-down here instead of

bias-disable ?

> +
> +				rts-pins {
> +					pins = "gpio62";
> +					function = "qup01";
> +					drive-strength = <2>;
> +					bias-disable;
> +				};
> +
> +				tx-pins {
> +					pins = "gpio63";
> +					function = "qup01";
> +					drive-strength = <2>;
> +					bias-disable;
> +				};
> +
> +				rx-pins {
> +					pins = "gpio64";
> +					function = "qup01";
> +					drive-strength = <2>;
> +					bias-pull-up;
> +				};
> +			};
>   		};
>   
>   		gcc: clock-controller@1400000 {
> @@ -1111,6 +1141,19 @@ spi1: spi@4a84000 {
>   				status = "disabled";
>   			};
>   
> +			uart1: serial@4a84000 {
> +				compatible = "qcom,geni-uart";
> +				reg = <0x0 0x04a84000 0x0 0x4000>;
> +				interrupts = <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>;
> +				clocks = <&gcc GCC_QUPV3_WRAP0_S1_CLK>;
> +				clock-names = "se";
> +				power-domains = <&rpmpd SM6375_VDDCX>;
> +				operating-points-v2 = <&qup_opp_table>;
> +				pinctrl-0 = <&qup_uart1_default>;
> +				pinctrl-names = "default";
> +				status = "disabled";
> +			};
> +
>   			i2c2: i2c@4a88000 {
>   				compatible = "qcom,geni-i2c";
>   				reg = <0x0 0x04a88000 0x0 0x4000>;
> 

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

Re: [PATCH 4/4] arm64: dts: qcom: sm6375-pdx225: Add USBPHY regulators

[Bryan O'Donoghue]

On 27/09/2023 10:21, Konrad Dybcio wrote:
> To make dtbs_check happy and the software more aware of what's going
> on, describe the HSUSB PHY's regulators and tighten up VDDA_PLL to match.
> 
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---
>   arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
> index bbec7aee60be..0ce4fa8de8b0 100644
> --- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
> +++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
> @@ -243,8 +243,8 @@ pm6125_l6: l6 {
>   		};
>   
>   		pm6125_l7: l7 {
> -			regulator-min-microvolt = <720000>;
> -			regulator-max-microvolt = <1050000>;
> +			regulator-min-microvolt = <880000>;
> +			regulator-max-microvolt = <880000>;

Where did the old values come from and why are the new values better ?

Consider enumerating that in the commit log.

>   		};
>   
>   		pm6125_l8: l8 {
> @@ -430,6 +430,9 @@ &usb_1_dwc3 {
>   };
>   
>   &usb_1_hsphy {
> +	vdda-pll-supply = <&pm6125_l7>;
> +	vdda18-supply = <&pm6125_l10>;
> +	vdda33-supply = <&pmr735a_l7>;
>   	status = "okay";
>   };

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

Re: [PATCH 4/4] arm64: dts: qcom: sm6375-pdx225: Add USBPHY regulators

[Konrad Dybcio]

On 27.09.2023 13:01, Bryan O'Donoghue wrote:
> On 27/09/2023 10:21, Konrad Dybcio wrote:
>> To make dtbs_check happy and the software more aware of what's going
>> on, describe the HSUSB PHY's regulators and tighten up VDDA_PLL to match.
>>
>> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
>> ---
>>   arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 7 +++++--
>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
>> index bbec7aee60be..0ce4fa8de8b0 100644
>> --- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
>> @@ -243,8 +243,8 @@ pm6125_l6: l6 {
>>           };
>>             pm6125_l7: l7 {
>> -            regulator-min-microvolt = <720000>;
>> -            regulator-max-microvolt = <1050000>;
>> +            regulator-min-microvolt = <880000>;
>> +            regulator-max-microvolt = <880000>;
> 
> Where did the old values come from and why are the new values better ?
> 
> Consider enumerating that in the commit log.
That's the pretty standard situation where:

- downstream defines very loose ranges
- developer uses these very loose ranges as a guideline
- some hardware (often the exclusive user of that regulator)
  has a hidden-ish request of a tighter range
- the developer realizes that and has to fix up the ranges

Konrad

Re: [PATCH 4/4] arm64: dts: qcom: sm6375-pdx225: Add USBPHY regulators

[Bryan O'Donoghue]

On 27/09/2023 12:05, Konrad Dybcio wrote:
> On 27.09.2023 13:01, Bryan O'Donoghue wrote:
>> On 27/09/2023 10:21, Konrad Dybcio wrote:
>>> To make dtbs_check happy and the software more aware of what's going
>>> on, describe the HSUSB PHY's regulators and tighten up VDDA_PLL to match.
>>>
>>> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
>>> ---
>>>    arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 7 +++++--
>>>    1 file changed, 5 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
>>> index bbec7aee60be..0ce4fa8de8b0 100644
>>> --- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
>>> +++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
>>> @@ -243,8 +243,8 @@ pm6125_l6: l6 {
>>>            };
>>>              pm6125_l7: l7 {
>>> -            regulator-min-microvolt = <720000>;
>>> -            regulator-max-microvolt = <1050000>;
>>> +            regulator-min-microvolt = <880000>;
>>> +            regulator-max-microvolt = <880000>;
>>
>> Where did the old values come from and why are the new values better ?
>>
>> Consider enumerating that in the commit log.
> That's the pretty standard situation where:
> 
> - downstream defines very loose ranges
> - developer uses these very loose ranges as a guideline
> - some hardware (often the exclusive user of that regulator)
>    has a hidden-ish request of a tighter range
> - the developer realizes that and has to fix up the ranges
> 
> Konrad

If you got 72 and 105 from downstream, where did you get 88 from ?

---
bod

Re: [PATCH 4/4] arm64: dts: qcom: sm6375-pdx225: Add USBPHY regulators

[Konrad Dybcio]

On 27.09.2023 13:16, Bryan O'Donoghue wrote:
> On 27/09/2023 12:05, Konrad Dybcio wrote:
>> On 27.09.2023 13:01, Bryan O'Donoghue wrote:
>>> On 27/09/2023 10:21, Konrad Dybcio wrote:
>>>> To make dtbs_check happy and the software more aware of what's going
>>>> on, describe the HSUSB PHY's regulators and tighten up VDDA_PLL to match.
>>>>
>>>> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
>>>> ---
>>>>    arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 7 +++++--
>>>>    1 file changed, 5 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
>>>> index bbec7aee60be..0ce4fa8de8b0 100644
>>>> --- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
>>>> +++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
>>>> @@ -243,8 +243,8 @@ pm6125_l6: l6 {
>>>>            };
>>>>              pm6125_l7: l7 {
>>>> -            regulator-min-microvolt = <720000>;
>>>> -            regulator-max-microvolt = <1050000>;
>>>> +            regulator-min-microvolt = <880000>;
>>>> +            regulator-max-microvolt = <880000>;
>>>
>>> Where did the old values come from and why are the new values better ?
>>>
>>> Consider enumerating that in the commit log.
>> That's the pretty standard situation where:
>>
>> - downstream defines very loose ranges
>> - developer uses these very loose ranges as a guideline
>> - some hardware (often the exclusive user of that regulator)
>>    has a hidden-ish request of a tighter range
>> - the developer realizes that and has to fix up the ranges
>>
>> Konrad
> 
> If you got 72 and 105 from downstream, where did you get 88 from ?
Also from downstream, except from the consumer driver

Konrad

Re: [PATCH 0/4] SM6375 features

[Bjorn Andersson]

On Wed, 27 Sep 2023 11:21:39 +0200, Konrad Dybcio wrote:
> Enable modem & wifi on sony 10 IV, add bt uart to the soc dt.
> 
> 

Applied, thanks!

[1/4] arm64: dts: qcom: sm6375: Add UART1
      commit: 1529f6a43cc4feeb78f6063ae3ae7d8003594de6
[2/4] arm64: dts: qcom: sm6375-pdx225: Enable MSS
      commit: ea6b3c61559f647d183322fc5431f2a5e78123d3
[3/4] arm64: dts: qcom: sm6375-pdx225: Enable ATH10K WiFi
      commit: 6ffcd65f27d7d083b9bfae56c9b5fe1a0b7500f8
[4/4] arm64: dts: qcom: sm6375-pdx225: Add USBPHY regulators
      commit: 2ea7de2f804432dd17bcfa97576f0ccf2054cd6e

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