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

Commit 723ba008 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 audio support for ferrum"

parents a218f269 a026e437

arch/arm/boot/dts/qcom/msm-pmferrum.dtsi

+69 −0
Original line number Diff line number Diff line
@@ -327,5 +327,74 @@ 
			reg = <0x5100 0x100>;

			status = "disabled";

		};



		pmferrum_conga_dig: ferrum_wcd_codec@f000 {

			compatible = "qcom,wcd-spmi";

			reg = <0xf000 0x100>;

			interrupt-parent = <&spmi_bus>;

			interrupts = <0x1 0xf0 0x0>,

				     <0x1 0xf0 0x1>,

				     <0x1 0xf0 0x2>,

				     <0x1 0xf0 0x3>,

				     <0x1 0xf0 0x4>,

				     <0x1 0xf0 0x5>,

				     <0x1 0xf0 0x6>,

				     <0x1 0xf0 0x7>;

			interrupt-names = "spk_cnp_int",

					  "spk_clip_int",

					  "spk_ocp_int",

					  "ins_rem_det1",

					  "but_rel_det",

					  "but_press_det",

					  "ins_rem_det",

					  "mbhc_int";



			cdc-vdda-cp-supply = <&pmferrum_s2>;

			qcom,cdc-vdda-cp-voltage = <1800000 2200000>;

			qcom,cdc-vdda-cp-current = <500000>;



			cdc-vdda-h-supply = <&pmferrum_l6>;

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

			qcom,cdc-vdda-h-current = <10000>;



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

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

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



			cdc-vdd-pa-supply = <&pmferrum_s2>;

			qcom,cdc-vdd-pa-voltage = <1800000 2200000>;

			qcom,cdc-vdd-pa-current = <130000>;



			cdc-vdd-mic-bias-supply = <&pmferrum_l13>;

			qcom,cdc-vdd-mic-bias-voltage = <3075000 3075000>;

			qcom,cdc-vdd-mic-bias-current = <5000>;



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



			qcom,cdc-static-supplies = "cdc-vdda-h",

						   "cdc-vdd-px",

						   "cdc-vdd-pa",

						   "cdc-vdda-cp";



			qcom,cdc-on-demand-supplies = "cdc-vdd-mic-bias";

		};



		pmferrum_conga_analog: ferrum_wcd_codec@f100 {

			compatible = "qcom,wcd-spmi";

			reg = <0xf100 0x100>;

			interrupt-parent = <&spmi_bus>;

			interrupts = <0x1 0xf1 0x0>,

				     <0x1 0xf1 0x1>,

				     <0x1 0xf1 0x2>,

				     <0x1 0xf1 0x3>,

				     <0x1 0xf1 0x4>,

				     <0x1 0xf1 0x5>;

			interrupt-names = "ear_ocp_int",

					  "hphr_ocp_int",

					  "hphl_ocp_det",

					  "ear_cnp_int",

					  "hphr_cnp_int",

					  "hphl_cnp_int";

		};

	};

};

arch/arm/boot/dts/qcom/msmferrum-pinctrl.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -41,6 +41,37 @@ 
			};

		};



		cdc-pdm-lines {

			qcom,pins = <&gp 59>, <&gp 60>, <&gp 61>,

					<&gp 62>, <&gp 63>, <&gp 64>;

			qcom,num-grp-pins = <6>;

			qcom,pin-func = <1>;

			label = "cdc-pdm-lines";

			cdc_pdm_lines_act: pdm_lines_on {

				drive-strength = <8>;

			};

			cdc_pdm_lines_sus: pdm_lines_off {

				drive-strength = <2>;

				bias-disable;

			};

		};



		cross-conn-det {

			qcom,pins = <&gp 97>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <0>;

			label = "cross-conn-det-sw";

			cross_conn_det_act: lines_on {

				drive-strength = <8>;

				output-low;

				bias-pull-down;

			};

			cross_conn_det_sus: lines_off {

				drive-strength = <2>;

				bias-disable;

			};

		};



		sdhc2_cd_pin {

			qcom,pins = <&gp 38>;

			qcom,num-grp-pins = <1>;

arch/arm/boot/dts/qcom/msmferrum.dtsi

+263 −0
Original line number Diff line number Diff line
@@ -735,7 +735,270 @@ 
		linux,contiguous-region = <&venus_qseecom_mem>;

	};



	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,latency-level = "ultra";

	};



	qcom,msm-pcm-lpa {

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

	};



	qcom,msm-compress-dsp {

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

	};



	qcom,msm-voip-dsp {

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

	};



	qcom,msm-pcm-voice {

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

		qcom,destroy-cvd;

		qcom,vote-bms;

	};



	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-voice-svc {

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

	};



	qcom,msm-pcm-loopback {

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

	};



	qcom,msm-dai-mi2s {

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

		qcom,msm-dai-q6-mi2s-prim {

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

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

			qcom,msm-mi2s-rx-lines = <3>;

			qcom,msm-mi2s-tx-lines = <0>;

		};



		qcom,msm-dai-q6-mi2s-sec {

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

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

			qcom,msm-mi2s-rx-lines = <1>;

			qcom,msm-mi2s-tx-lines = <0>;

		};



		qcom,msm-dai-q6-mi2s-quat {

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

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

			qcom,msm-mi2s-rx-lines = <1>;

			qcom,msm-mi2s-tx-lines = <2>;

		};



		qcom,msm-dai-q6-mi2s-tert {

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

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

			qcom,msm-mi2s-rx-lines = <0>;

			qcom,msm-mi2s-tx-lines = <3>;

		};

	};



	qcom,msm-dai-q6-hdmi {

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

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

	};



	qcom,msm-lsm-client {

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

	};



	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";

	};



	qcom,msm-pri-auxpcm {

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

		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-num-slots = <1>, <1>;

		qcom,msm-cpudai-auxpcm-slot-mapping = <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-audio-ion {

		compatible = "qcom,msm-audio-ion";

	};



	qcom,msm-adsp-loader {

		compatible = "qcom,adsp-loader";

		qcom,adsp-state = <0>;

		qcom,proc-img-to-load = "modem";

	};



	qcom,avtimer@770600c {

		compatible = "qcom,avtimer";

		reg = <0x0770600C 0x4>,

			<0x07706010 0x4>;

		reg-names = "avtimer_lsb_addr", "avtimer_msb_addr";

		qcom,clk_div = <27>;

	};



	sound {

		compatible = "qcom,msm8x16-audio-codec";

		qcom,model = "msmferrum-snd-card";

		qcom,msm-snd-card-id = <0>;

		qcom,msm-codec-type = "internal";

		qcom,msm-ext-pa = "primary";

		qcom,msm-mclk-freq = <9600000>;

		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,msm-hs-micbias-type = "internal";

		qcom,msm-micbias1-ext-cap;

		qcom,msm-micbias2-ext-cap;

		qcom,audio-routing =

			"RX_BIAS", "MCLK",

			"SPK_RX_BIAS", "MCLK",

			"INT_LDO_H", "MCLK",

			"MIC BIAS External", "Handset Mic",

			"MIC BIAS Internal2", "Headset Mic",

			"MIC BIAS External", "Secondary Mic",

			"AMIC1", "MIC BIAS External",

			"AMIC2", "MIC BIAS Internal2",

			"AMIC3", "MIC BIAS External";

		pinctrl-names = "cdc_lines_act",

				"cdc_lines_sus",

				"cross_conn_det_act",

				"cross_conn_det_sus";

		pinctrl-0 = <&cdc_pdm_lines_act>;

		pinctrl-1 = <&cdc_pdm_lines_sus>;

		pinctrl-2 = <&cross_conn_det_act>;

		pinctrl-3 = <&cross_conn_det_sus>;

		qcom,cdc-us-euro-gpios = <&msm_gpio 97 0>;

	};

};



#include "msm-pmferrum.dtsi"