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

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

Merge "ARM: dts: msm: Add audio support for qcs405 platform"

parents bd817a7a a95a8d22

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

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ Example: 
                q6core {

                        compatible = "qcom,q6core-audio";

                        bolero: bolero-cdc {

                                compatible = "qcom,bolero-cdc";

                                compatible = "qcom,bolero-codec";

                        };

                };

	};

Documentation/devicetree/bindings/soundwire/swr-mstr-ctrl.txt

0 → 100644
+49 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. SoundWire Master controller



* swr_master



Required properties:



- compatible : should be "qcom,swr-mstr"

- #address-cells: must be 2

- #size-cells: must be 0

- qcom,swr-num-ports: number of ports in the master.

- qcom,swr-port-mapping: contains codec port_type and

	corresponding ch-mask entries for possible port types

	of the master port.



* wsa881x



Required properties:



- compatible : should be "qcom,wsa881x"

- reg : Unique device ID(48 bits) of Soundwire slave device node.

	In the below example, wsa881x is soundwire slave device for

	which the swr-devid is <0x0 0x032000> where 0x03 represents

	device Unique_ID, 0x20 represents Part_Id1 and 0x00

	represents part_Id2.



 Example:



swr0: swr_master {

		compatible = "qcom,swr-mstr";

		#address-cells = <2>;

		#size-cells = <0>;



		qcom,swr-num-ports = <8>;

		qcom,swr-port-mapping = <1 SPKR_L 0x1>,

		<2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>,

		<4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>,

		<6 SPKR_R_BOOST 0x3>, <7 SPKR_L_VI 0x3>,

		<8 SPKR_R_VI 0x3>;



		wsa881x@32000 {

			compatible = "qcom,wsa881x";

			reg = <0x00 0x032000>;

		};



		wsa881x@42000 {

			compatible = "qcom,wsa881x";

			reg = <0x00 0x042000>;

		};

	};

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

+38 −0
Original line number Diff line number Diff line
@@ -129,6 +129,44 @@ 
		};

	};



	msm_dai_cdc_dma: qcom,msm-dai-cdc-dma {

		compatible = "qcom,msm-dai-cdc-dma";

		wsa_cdc_dma_0_rx: qcom,msm-dai-wsa-cdc-dma-0-rx {

			compatible = "qcom,msm-dai-cdc-dma-dev";

			qcom,msm-dai-cdc-dma-dev-id = <45056>;

		};



		wsa_cdc_dma_0_tx: qcom,msm-dai-wsa-cdc-dma-0-tx {

			compatible = "qcom,msm-dai-cdc-dma-dev";

			qcom,msm-dai-cdc-dma-dev-id = <45057>;

		};



		wsa_cdc_dma_1_rx: qcom,msm-dai-wsa-cdc-dma-1-rx {

			compatible = "qcom,msm-dai-cdc-dma-dev";

			qcom,msm-dai-cdc-dma-dev-id = <45058>;

		};



		wsa_cdc_dma_1_tx: qcom,msm-dai-wsa-cdc-dma-1-tx {

			compatible = "qcom,msm-dai-cdc-dma-dev";

			qcom,msm-dai-cdc-dma-dev-id = <45059>;

		};



		wsa_cdc_dma_2_tx: qcom,msm-dai-wsa-cdc-dma-2-tx {

			compatible = "qcom,msm-dai-cdc-dma-dev";

			qcom,msm-dai-cdc-dma-dev-id = <45061>;

		};



		va_cdc_dma_0_tx: qcom,msm-dai-va-cdc-dma-0-tx {

			compatible = "qcom,msm-dai-cdc-dma-dev";

			qcom,msm-dai-cdc-dma-dev-id = <45089>;

		};



		va_cdc_dma_1_tx: qcom,msm-dai-va-cdc-dma-1-tx {

			compatible = "qcom,msm-dai-cdc-dma-dev";

			qcom,msm-dai-cdc-dma-dev-id = <45091>;

		};

	};



	lsm: qcom,msm-lsm-client {

		compatible = "qcom,msm-lsm-client";

	};

arch/arm64/boot/dts/qcom/qcs403-iot-sku1.dts

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
/dts-v1/;



#include "qcs403.dtsi"

#include "qcs405-wsa-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. QCS403 EVB2 1000 IOT";

arch/arm64/boot/dts/qcom/qcs403-iot-sku2.dts

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
/dts-v1/;



#include "qcs403.dtsi"

#include "qcs405-nowcd-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. QCS403 RCM IOT";