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

Commit f991df95 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 msm8952 machine driver for msm8905"

parents 41c6dc11 eb3e89de

arch/arm64/boot/dts/qcom/msm8905-qrd-skub.dtsi

+127 −11
Original line number Diff line number Diff line
@@ -231,9 +231,30 @@ 
};



&soc {

	qcom,msm-audio-apr {

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

		msm_audio_apr_dummy {

			compatible = "qcom,msm-audio-apr-dummy";

		};

	};



	qcom,avtimer@c0a300c {

		compatible = "qcom,avtimer";

		reg = <0x0c0a300c 0x4>,

			<0x0c0a3010 0x4>;

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

		qcom,clk-div = <27>;

	};



	sound {

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

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

		qcom,model = "msm8909-skub-snd-card";

		reg = <0x7702000 0x4>,

		      <0x7702004 0x4>,

		      <0x7702008 0x4>;

		reg-names = "csr_gp_io_mux_mic_ctl",

			    "csr_gp_io_mux_spkr_ctl",

			    "csr_gp_io_lpaif_pri_pcm_pri_mode_muxsel";

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

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

		qcom,msm-ext-pa = "primary";
@@ -251,23 +272,24 @@ 
			"MIC BIAS Internal2", "Headset Mic",

			"AMIC1", "MIC BIAS Internal1",

			"AMIC2", "MIC BIAS Internal2";

		pinctrl-names = "cdc_lines_act",

				"cdc_lines_sus";

		pinctrl-0 = <&cdc_pdm_lines_act>;

		pinctrl-1 = <&cdc_pdm_lines_sus>;

		asoc-platform = <&pcm0>, <&pcm1>, <&voip>, <&voice>,



		qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>;



		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>,

				<&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&lpa>,

				<&voice_svc>;

				<&afe>, <&lsm>, <&routing>, <&pcm_noirq>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2",

				"msm-voip-dsp", "msm-pcm-voice",

				"msm-pcm-loopback", "msm-compress-dsp",

				"msm-pcm-hostless", "msm-pcm-afe",

				"msm-lsm-client", "msm-pcm-routing",

				"msm-pcm-lpa", "msm-voice-svc";

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_mi2s5>,

				<&sb_0_rx>, <&sb_0_tx>,

				<&sb_1_rx>, <&sb_1_tx>,

				<&sb_3_rx>, <&sb_3_tx>,
@@ -281,6 +303,7 @@ 
		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-hdmi.8",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.6",

				"msm-dai-q6-dev.16384",	"msm-dai-q6-dev.16385",

				"msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387",

				"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",
@@ -292,8 +315,17 @@ 
				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770";

		asoc-codec = <&stub_codec>, <&pm8909_conga_dig>;

		asoc-codec-names = "msm-stub-codec.1", "tombak_codec";

		asoc-codec = <&stub_codec>, <&msm_digital_codec>,

				<&pmic_analog_codec>;

		asoc-codec-names = "msm-stub-codec.1", "msm-dig-codec",

				"analog-codec";

	};



	cdc_pri_mi2s_gpios: msm_cdc_pinctrl_pri {

		compatible = "qcom,msm-cdc-pinctrl";

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_pdm_lines_act>;

		pinctrl-1 = <&cdc_pdm_lines_sus>;

	};



	spi@78b9000 { /* BLSP1 QUP5 */
@@ -344,6 +376,82 @@ 
	};

};



&pm8909_1 {

	pmic_analog_codec: analog-codec@f100 {

		status = "okay";

		compatible = "qcom,pmic-analog-codec";

		reg = <0xf000 0x200>;

		#address-cells = <2>;

		#size-cells = <0>;

		interrupt-parent = <&spmi_bus>;

		interrupts =

			<0x1 0xf0 0x0 IRQ_TYPE_NONE>,

			<0x1 0xf0 0x1 IRQ_TYPE_NONE>,

			<0x1 0xf0 0x2 IRQ_TYPE_NONE>,

			<0x1 0xf0 0x3 IRQ_TYPE_NONE>,

			<0x1 0xf0 0x4 IRQ_TYPE_NONE>,

			<0x1 0xf0 0x5 IRQ_TYPE_NONE>,

			<0x1 0xf0 0x6 IRQ_TYPE_NONE>,

			<0x1 0xf0 0x7 IRQ_TYPE_NONE>,

			<0x1 0xf1 0x0 IRQ_TYPE_NONE>,

			<0x1 0xf1 0x1 IRQ_TYPE_NONE>,

			<0x1 0xf1 0x2 IRQ_TYPE_NONE>,

			<0x1 0xf1 0x3 IRQ_TYPE_NONE>,

			<0x1 0xf1 0x4 IRQ_TYPE_NONE>,

			<0x1 0xf1 0x5 IRQ_TYPE_NONE>;

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

			"ear_ocp_int",

			"hphr_ocp_int",

			"hphl_ocp_det",

			"ear_cnp_int",

			"hphr_cnp_int",

			"hphl_cnp_int";



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

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

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



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

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

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



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

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

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



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

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

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



		cdc-vdd-mic-bias-supply = <&pm8909_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";



		msm_digital_codec: msm-dig-codec@f000 {

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

			reg = <0x771c000 0x100>;

		};

	};

};



&pm8909_mpps {

	mpp@a100 { /* MPP 2 */

		/* Backlight PWM */
@@ -456,3 +564,11 @@ 
&actuator0 {

	status = "disabled";

};



&pm8909_conga_dig {

	status = "disabled";

};



&pm8909_conga_analog {

	status = "disabled";

};