diff mbox series

[7/7] arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth firmware loading

Message ID 20221016143300.1738550-8-caleb@connolly.tech (mailing list archive)
State Changes Requested
Headers show
Series arm64: dts: qcom: sdm845: commonize bluetooth pinconf | expand

Commit Message

Caleb Connolly Oct. 16, 2022, 2:34 p.m. UTC 
From: Dylan Van Assche <me@dylanvanassche.be>

Add serial1 alias, firmware name and use 4 pin UART pinmux.

Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
Tested-by: Alexander Martinz <amartinz@shiftphones.com>
Signed-off-by: Caleb Connolly <caleb@connolly.tech>
---
 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 9 +++++++++
 1 file changed, 9 insertions(+)

--
2.38.0

Comments

Krzysztof Kozlowski Oct. 16, 2022, 2:58 p.m. UTC | #1 
On 16/10/2022 10:34, Caleb Connolly wrote:
> From: Dylan Van Assche <me@dylanvanassche.be>
> 
> Add serial1 alias, firmware name and use 4 pin UART pinmux.
> 
> Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
> Tested-by: Alexander Martinz <amartinz@shiftphones.com>
> Signed-off-by: Caleb Connolly <caleb@connolly.tech>

All your patches - except 1 - are not properly threaded.

Best regards,
Krzysztof
Caleb Connolly Oct. 16, 2022, 3 p.m. UTC | #2 
On 16/10/2022 15:58, Krzysztof Kozlowski wrote:
> On 16/10/2022 10:34, Caleb Connolly wrote:
>> From: Dylan Van Assche <me@dylanvanassche.be>
>>
>> Add serial1 alias, firmware name and use 4 pin UART pinmux.
>>
>> Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
>> Tested-by: Alexander Martinz <amartinz@shiftphones.com>
>> Signed-off-by: Caleb Connolly <caleb@connolly.tech>
>
> All your patches - except 1 - are not properly threaded.

Sorry about that! It seems that Protonmail have decided to break In-Reply-To
again... I resent the series with threading here:

https://lore.kernel.org/linux-arm-msm/20221016144714.1742824-1-kc@postmarketos.org/T/#t

>
> Best regards,
> Krzysztof
>

--
Kind Regards,
Caleb
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index 83261c9bb4f2..3e038156af4f 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -22,6 +22,7 @@  / {

 	aliases {
 		display0 = &framebuffer0;
+		serial1 = &uart6;
 		serial0 = &uart9;
 	};

@@ -693,9 +694,17 @@  config {
 &uart6 {
 	status = "okay";

+	pinctrl-0 = <&qup_uart6_4pin>;
+
 	bluetooth {
 		compatible = "qcom,wcn3990-bt";

+		/*
+		 * This path is relative to the qca/
+		 * subdir under lib/firmware.
+		 */
+		firmware-name = "axolotl/crnv21.bin";
+
 		vddio-supply = <&vreg_s4a_1p8>;
 		vddxo-supply = <&vreg_l7a_1p8>;
 		vddrf-supply = <&vreg_l17a_1p3>;