diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi index 8b7a271b7568..27221b3afb30 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi @@ -27,10 +27,17 @@ /delete-node/ &wlan_msa_mem; / { + aliases { + serial0 = &uart9; + serial1 = &uart6; + }; + chosen { #address-cells = <2>; #size-cells = <2>; ranges; + + stdout-path = "serial0:115200n8"; }; reserved-memory { @@ -498,6 +505,16 @@ &qupv3_id_1 { status = "okay"; }; +&qup_uart9_rx { + drive-strength = <2>; + bias-pull-up; +}; + +&qup_uart9_tx { + drive-strength = <2>; + bias-disable; +}; + &sdhc_2 { cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>; @@ -548,6 +565,26 @@ sd_card_det_n: sd-card-det-n-state { }; }; +&uart6 { + pinctrl-0 = <&qup_uart6_4pin>; + + status = "okay"; + + bluetooth: bluetooth { + compatible = "qcom,wcn3990-bt"; + + vddio-supply = <&vreg_s4a_1p8>; + vddxo-supply = <&vreg_l7a_1p8>; + vddrf-supply = <&vreg_l17a_1p3>; + vddch0-supply = <&vreg_l25a_3p3>; + max-speed = <3200000>; + }; +}; + +&uart9 { + status = "okay"; +}; + /* * UFS works partially and only with clk_ignore_unused. * Sometimes it crashes with I/O errors. diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts b/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts index 6d6cc197176c..90dd5a2a6f30 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts @@ -43,6 +43,14 @@ &adsp_pas { firmware-name = "qcom/sdm845/LG/judyln/adsp.mbn"; }; +&bluetooth { + /* + * This path is relative to the qca/ + * subdir under lib/firmware. + */ + firmware-name = "judyln/crnv21.bin"; +}; + &cdsp_pas { firmware-name = "qcom/sdm845/LG/judyln/cdsp.mbn"; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts b/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts index fd62abbb7128..efca260c3dcf 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts @@ -29,6 +29,14 @@ &adsp_pas { firmware-name = "qcom/sdm845/LG/judyp/adsp.mbn"; }; +&bluetooth { + /* + * This path is relative to the qca/ + * subdir under lib/firmware. + */ + firmware-name = "judyp/crnv21.bin"; +}; + &cdsp_pas { firmware-name = "qcom/sdm845/LG/judyp/cdsp.mbn"; };