Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdb6a177 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add SLIMbus device ID for SLIMbus 7"

parents dc95bc0f 442e5b72

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+9 −1
Original line number Diff line number Diff line
@@ -220,6 +220,13 @@ Required properties: 
                            inCall Music Delivery port ID is 32773.

                            incall Music 2 Delivery port ID is 32770.



Optional properties:



 - qcom,msm-dai-q6-slim-dev-id : The Slimbus HW device (instance) ID associated

                                 with Slimbus ports.

                                 0 - Slimbus HW device ID 0 (first instance)

                                 1 - Slimbus HW device ID 1 (second instance)



* msm_dai_cdc_dma



[First Level Nodes]
@@ -553,6 +560,7 @@ Example: 
		qcom,msm-dai-q6-sb-0-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16384>;

			qcom,msm-dai-q6-slim-dev-id = <0>;

		};



		qcom,msm-dai-q6-sb-0-tx {

arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -256,11 +256,13 @@ 
		sb_7_rx: qcom,msm-dai-q6-sb-7-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16398>;

			qcom,msm-dai-q6-slim-dev-id = <0>;

		};



		sb_7_tx: qcom,msm-dai-q6-sb-7-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16399>;

			qcom,msm-dai-q6-slim-dev-id = <0>;

		};



		bt_sco_rx: qcom,msm-dai-q6-bt-sco-rx {