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

Commit 0c05e557 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 codec device for msmsamarium"

parents 3598bad0 d4655340

Documentation/devicetree/bindings/sound/taiko_codec.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ taiko audio CODEC 


Required properties:



 - compatible : "qcom,taiko-slim-pgd"

 - compatible : "qcom,taiko-slim-pgd" or "qcom,tapan-slim-pgd" for Tapan codec

 - elemental-addr: codec slimbus slave PGD enumeration address.(48 bits)



 - qcom,cdc-reset-gpio: gpio used for codec SOC reset.

arch/arm/boot/dts/msmsamarium.dtsi

+258 −0
Original line number Diff line number Diff line
@@ -538,6 +538,264 @@ 
	qcom,bcl {

		compatible = "qcom,bcl";

	};



	wcd9xxx_intc: wcd9xxx-irq {

		compatible = "qcom,wcd9306-irq", "qcom,wcd9xxx-irq";

		interrupt-controller;

		#interrupt-cells = <1>;

		interrupt-parent = <&msmgpio>;

		interrupts = <72 0>;

		interrupt-names = "cdc-int";

	};



	slim_msm: slim@fe12f000 {

		cell-index = <1>;

		compatible = "qcom,slim-ngd";

		reg = <0xfe12f000 0x35000>,

		      <0xfe104000 0x20000>;

			reg-names = "slimbus_physical", "slimbus_bam_physical";

		interrupts = <0 163 0 0 164 0>;

		interrupt-names = "slimbus_irq", "slimbus_bam_irq";



		tapan_codec {

			compatible = "qcom,tapan-slim-pgd";

			elemental-addr = [00 01 E0 00 17 02];



			interrupt-parent = <&wcd9xxx_intc>;

			interrupts = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16

				      17 18 19 20 21 22 23 24 25 26 27 28>;



			qcom,cdc-reset-gpio = <&msmgpio 63 0>;



			cdc-vdd-buck-supply = <&pma8084_s5>;

			qcom,cdc-vdd-buck-voltage = <2150000 2150000>;

			qcom,cdc-vdd-buck-current = <650000>;



			cdc-vdd-h-supply = <&pma8084_s4>;

			qcom,cdc-vdd-h-voltage = <1800000 1800000>;

			qcom,cdc-vdd-h-current = <25000>;



			cdc-vdd-px-supply = <&pma8084_s4>;

			qcom,cdc-vdd-px-voltage = <1800000 1800000>;

			qcom,cdc-vdd-px-current = <10000>;



			cdc-vdd-a-1p2v-supply = <&pma8084_l1>;

			qcom,cdc-vdd-a-1p2v-voltage = <1225000 1225000>;

			qcom,cdc-vdd-a-1p2v-current = <10000>;



			cdc-vdd-cx-supply = <&pma8084_l1>;

			qcom,cdc-vdd-cx-voltage = <1225000 1225000>;

			qcom,cdc-vdd-cx-current = <10000>;



			qcom,cdc-static-supplies =      "cdc-vdd-buck",

							"cdc-vdd-h",

							"cdc-vdd-px",

							"cdc-vdd-a-1p2v",

							"cdc-vdd-cx";



			qcom,cdc-micbias-ldoh-v = <0x3>;

			qcom,cdc-micbias-cfilt1-mv = <1800>;

			qcom,cdc-micbias-cfilt2-mv = <2700>;

			qcom,cdc-micbias-cfilt3-mv = <1800>;

			qcom,cdc-micbias1-cfilt-sel = <0x0>;

			qcom,cdc-micbias2-cfilt-sel = <0x1>;

			qcom,cdc-micbias3-cfilt-sel = <0x2>;



			qcom,cdc-mclk-clk-rate = <9600000>;

			qcom,cdc-slim-ifd = "tapan-slim-ifd";

			qcom,cdc-slim-ifd-elemental-addr = [00 00 E0 00 17 02];



			qcom,cdc-dmic-sample-rate = <4800000>;

		};

	};



	sound {

		compatible = "qcom,msmsamarium-audio-tapan";

		qcom,model = "msmsamarium-tapan-snd-card";

		qcom,tapan-mclk-clk-freq = <9600000>;

		qcom,audio-routing =

                        "RX_BIAS", "MCLK",

                        "LDO_H", "MCLK",

                        "SPK_OUT", "MCLK",

                        "AMIC1", "MIC BIAS1 Internal1",

                        "MIC BIAS1 Internal1", "Handset Mic",

                        "AMIC2", "MIC BIAS2 External",

                        "MIC BIAS2 External", "Headset Mic",

                        "AMIC3", "MIC BIAS2 External",

                        "MIC BIAS2 External", "ANCRight Headset Mic",

                        "AMIC4", "MIC BIAS2 External",

                        "MIC BIAS2 External", "ANCLeft Headset Mic",

                        "DMIC1", "MIC BIAS1 External",

                        "MIC BIAS1 External", "Digital Mic1",

                        "DMIC2", "MIC BIAS1 External",

                        "MIC BIAS1 External", "Digital Mic2",

                        "DMIC3", "MIC BIAS3 External",

                        "MIC BIAS3 External", "Digital Mic3",

                        "DMIC4", "MIC BIAS3 External",

                        "MIC BIAS3 External", "Digital Mic4";



		qcom,cdc-mclk-gpios = <&pma8084_gpios 15 0>;

	};



	qcom,msm-adsp-loader {

		compatible = "qcom,adsp-loader";

		qcom,adsp-state = <0>;

	};



	qcom,msm-pcm {

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

		qcom,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;

	};



	qcom,msm-pcm-lpa {

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

	};



	qcom,msm-compr-dsp {

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

	};



	qcom,msm-voip-dsp {

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

	};



	qcom,msm-pcm-voice {

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

	};



	qcom,msm-stub-codec {

		compatible = "qcom,msm-stub-codec";

	};



	qcom,msm-dai-fe {

		compatible = "qcom,msm-dai-fe";

	};



	qcom,msm-pcm-afe {

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

	};



	qcom,msm-dai-q6-hdmi {

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

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

	};



	qcom,msm-dai-q6 {

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

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

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

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

		};



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

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

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

		};



		qcom,msm-dai-q6-sb-1-rx {

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

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

		};



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

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

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

		};



		qcom,msm-dai-q6-sb-3-rx {

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

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

		};



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

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

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

		};



		qcom,msm-dai-q6-sb-4-rx {

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

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

		};



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

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

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

		};



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

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

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

		};



		qcom,msm-dai-q6-bt-sco-tx {

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

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

		};



		qcom,msm-dai-q6-int-fm-rx {

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

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

		};



		qcom,msm-dai-q6-int-fm-tx {

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

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

		};



		qcom,msm-dai-q6-be-afe-pcm-rx {

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

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

		};



		qcom,msm-dai-q6-be-afe-pcm-tx {

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

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

		};



		qcom,msm-dai-q6-afe-proxy-rx {

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

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

		};



		qcom,msm-dai-q6-afe-proxy-tx {

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

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

		};



		qcom,msm-dai-q6-incall-record-rx {

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

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

		};



		qcom,msm-dai-q6-incall-record-tx {

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

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

		};



		qcom,msm-dai-q6-incall-music-rx {

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

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

		};



		qcom,msm-dai-q6-incall-music-2-rx {

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

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

		};

	};



	qcom,msm-pcm-hostless {

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

	};

};



&gdsc_venus {