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

Commit 03305514 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: Add AUXPCM information to msmsamarium"

parents d07984c0 30b688a2

arch/arm/boot/dts/msmsamarium-cdp.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -66,6 +66,18 @@ 
			debounce-interval = <15>;

		};

	};



	sound {

		qcom,prim-auxpcm-gpio-clk  = <&msmgpio 65 0>;

		qcom,prim-auxpcm-gpio-sync = <&msmgpio 66 0>;

		qcom,prim-auxpcm-gpio-din  = <&msmgpio 67 0>;

		qcom,prim-auxpcm-gpio-dout = <&msmgpio 68 0>;

		qcom,prim-auxpcm-gpio-set = "prim-gpio-prim";

		qcom,sec-auxpcm-gpio-clk  = <&msmgpio 70 0>;

		qcom,sec-auxpcm-gpio-sync = <&msmgpio 72 0>;

		qcom,sec-auxpcm-gpio-din  = <&msmgpio 71 0>;

		qcom,sec-auxpcm-gpio-dout = <&msmgpio 73 0>;

	};

};



&i2c_2 {

arch/arm/boot/dts/msmsamarium-mtp.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -101,6 +101,16 @@ 
                        "MIC BIAS3 External", "Digital Mic3",

                        "DMIC4", "MIC BIAS3 External",

                        "MIC BIAS3 External", "Digital Mic4";



		qcom,prim-auxpcm-gpio-clk  = <&msmgpio 65 0>;

		qcom,prim-auxpcm-gpio-sync = <&msmgpio 66 0>;

		qcom,prim-auxpcm-gpio-din  = <&msmgpio 67 0>;

		qcom,prim-auxpcm-gpio-dout = <&msmgpio 68 0>;

		qcom,prim-auxpcm-gpio-set = "prim-gpio-prim";

		qcom,sec-auxpcm-gpio-clk  = <&msmgpio 70 0>;

		qcom,sec-auxpcm-gpio-sync = <&msmgpio 72 0>;

		qcom,sec-auxpcm-gpio-din  = <&msmgpio 71 0>;

		qcom,sec-auxpcm-gpio-dout = <&msmgpio 73 0>;

	};

};

arch/arm/boot/dts/msmsamarium.dtsi

+48 −0
Original line number Diff line number Diff line
@@ -1651,6 +1651,54 @@ 
		compatible = "qcom,msm-pcm-hostless";

	};



	qcom,msm-pri-auxpcm-rx {

		compatible = "qcom,msm-auxpcm-dev-rx";

		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;

		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "primary";

	};



	qcom,msm-pri-auxpcm-tx {

		compatible = "qcom,msm-auxpcm-dev-tx";

		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;

		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "primary";

	};



	qcom,msm-sec-auxpcm-rx {

		compatible = "qcom,msm-auxpcm-dev-rx";

		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;

		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "secondary";

	};



	qcom,msm-sec-auxpcm-tx {

		compatible = "qcom,msm-auxpcm-dev-tx";

		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;

		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "secondary";

	};



	qcom,ocmem@fdd00000 {

		compatible = "qcom,msm-ocmem";

		reg = <0xfdd00000 0x2000>,