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

Commit 206cbf1d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update device tree node for msm-pcm-dsp"

parents a1fcbd2a 70c01024

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

+13 −13
Original line number Diff line number Diff line
@@ -4,21 +4,21 @@ Qualcomm audio devices for ALSA sound SoC 


Required properties:



 - compatible : "qcom,msm-pcm-dsp"

 - compatible : "qti,msm-pcm-dsp"



 - qcom,msm-pcm-dsp-id : device node id

 - qti,msm-pcm-dsp-id : device node id



* msm-pcm-low-latency



Required properties:



 - compatible : "qcom,msm-pcm-dsp"

 - compatible : "qti,msm-pcm-dsp"



 - qcom,msm-pcm-dsp-id : device node id

 - qti,msm-pcm-dsp-id : device node id



   Optional properties



      - qcom,msm-pcm-low-latency : Flag indicating whether

      - qti,msm-pcm-low-latency : Flag indicating whether

        the device node is of type low latency.



* msm-pcm-routing
@@ -247,15 +247,15 @@ Required properties: 


Example:



        qcom,msm-pcm {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <0>;

	qti,msm-pcm {

		compatible = "qti,msm-pcm-dsp";

		qti,msm-pcm-dsp-id = <0>;

	};



	qcom,msm-pcm-low-latency {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <1>;

		qcom,msm-pcm-low-latency;

	qti,msm-pcm-low-latency {

		compatible = "qti,msm-pcm-dsp";

		qti,msm-pcm-dsp-id = <1>;

		qti,msm-pcm-low-latency;

	};



        qcom,msm-pcm-routing {

arch/arm/boot/dts/qti/apq8084.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -2465,15 +2465,15 @@ 
		qcom,smmu-enabled;

	};



	qcom,msm-pcm {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <0>;

	qti,msm-pcm {

		compatible = "qti,msm-pcm-dsp";

		qti,msm-pcm-dsp-id = <0>;

	};



	qcom,msm-pcm-low-latency {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <1>;

		qcom,msm-pcm-low-latency;

	qti,msm-pcm-low-latency {

		compatible = "qti,msm-pcm-dsp";

		qti,msm-pcm-dsp-id = <1>;

		qti,msm-pcm-low-latency;

	};



	qcom,msm-pcm-routing {

arch/arm/boot/dts/qti/msm8226.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -475,19 +475,19 @@ 
		qcom,tapan-codec-9302;

	};



	qcom,msm-pcm {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <0>;

	qti,msm-pcm {

		compatible = "qti,msm-pcm-dsp";

		qti,msm-pcm-dsp-id = <0>;

	};



	qcom,msm-pcm-routing {

		compatible = "qcom,msm-pcm-routing";

	};



	qcom,msm-pcm-low-latency {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <1>;

		qcom,msm-pcm-low-latency;

	qti,msm-pcm-low-latency {

		compatible = "qti,msm-pcm-dsp";

		qti,msm-pcm-dsp-id = <1>;

		qti,msm-pcm-low-latency;

	};



	qcom,msm-pcm-lpa {

arch/arm/boot/dts/qti/msm8610.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -695,15 +695,15 @@ 
		qcom,model = "msm8x10-snd-card";

	};



	qcom,msm-pcm {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <0>;

	qti,msm-pcm {

		compatible = "qti,msm-pcm-dsp";

		qti,msm-pcm-dsp-id = <0>;

	};



	qcom,msm-pcm-low-latency {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <1>;

		qcom,msm-pcm-low-latency;

	qti,msm-pcm-low-latency {

		compatible = "qti,msm-pcm-dsp";

		qti,msm-pcm-dsp-id = <1>;

		qti,msm-pcm-low-latency;

	};



	qcom,msm-pcm-routing {

arch/arm/boot/dts/qti/msm8974.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -1721,15 +1721,15 @@ 
		compatible = "qcom,msm-audio-ion";

	};



	qcom,msm-pcm {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <0>;

	qti,msm-pcm {

		compatible = "qti,msm-pcm-dsp";

		qti,msm-pcm-dsp-id = <0>;

	};



	qcom,msm-pcm-low-latency {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <1>;

		qcom,msm-pcm-low-latency;

	qti,msm-pcm-low-latency {

		compatible = "qti,msm-pcm-dsp";

		qti,msm-pcm-dsp-id = <1>;

		qti,msm-pcm-low-latency;

	};



	qcom,msm-pcm-routing {