Merge "ARM: dts: msm: enable audio for 8909" (1fdcf773) · Commits · e / devices / android_kernel_xiaomi_markw

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

+3 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -551,7 +551,7 @@
		};

		pm8916_tombak_dig: msm8x16_wcd_codec@f000{
		compatible = "qcom,wcd-spmi";
		compatible = "qcom,msm8x16_wcd_codec";
		reg = <0xf000 0x100>;
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x1 0xf0 0x0>,
		@@ -602,7 +602,7 @@
		};

		pm8916_tombak_analog: msm8x16_wcd_codec@f100{
		compatible = "qcom,wcd-spmi";
		compatible = "qcom,msm8x16_wcd_codec";
		reg = <0xf100 0x100>;
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x1 0xf1 0x0>,

arch/arm/boot/dts/qcom/msm8909-mtp.dtsi

+83 −0

Original line number	Diff line number	Diff line
		@@ -179,6 +179,89 @@
		};
		};

		audio_codec_mtp: sound {
		compatible = "qcom,msm8952-audio-codec";
		qcom,model = "msm8909-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";
		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-afe-clk-ver = <1>;
		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";
		qcom,msm-gpios =
		"pri_i2s",
		"us_eu_gpio";
		qcom,pinctrl-names =
		"all_off",
		"pri_i2s_act",
		"us_eu_gpio_act",
		"pri_i2s_us_eu_gpio_act";
		pinctrl-names =
		"all_off",
		"pri_i2s_act",
		"us_eu_gpio_act",
		"pri_i2s_us_eu_gpio_act";
		pinctrl-0 = <&cdc_pdm_lines_sus &cross_conn_det_sus
		&vdd_spkdrv_sus>;
		pinctrl-1 = <&cdc_pdm_lines_act &cross_conn_det_sus
		&vdd_spkdrv_act>;
		pinctrl-2 = <&cdc_pdm_lines_sus &cross_conn_det_act
		&vdd_spkdrv_sus>;
		pinctrl-3 = <&cdc_pdm_lines_act &cross_conn_det_act
		&vdd_spkdrv_act>;
		qcom,cdc-us-euro-gpios = <&msm_gpio 97 0>;
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
		<&loopback>, <&compress>, <&hostless>,
		<&afe>, <&lsm>, <&routing>, <&lpa>,
		<&voice_svc>;
		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";
		asoc-cpu = <&dai_pri_auxpcm>,
		<&dai_mi2s0>, <&dai_mi2s1>, <&dai_mi2s2>,
		<&dai_mi2s3>, <&dai_mi2s5>, <&dai_mi2s6>,
		<&bt_sco_rx>, <&bt_sco_tx>, <&int_fm_rx>,
		<&int_fm_tx>, <&afe_pcm_rx>, <&afe_pcm_tx>,
		<&afe_proxy_rx>, <&afe_proxy_tx>,
		<&incall_record_rx>, <&incall_record_tx>,
		<&incall_music_rx>, <&incall_music_2_rx>;
		asoc-cpu-names = "msm-dai-q6-auxpcm.1",
		"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
		"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
		"msm-dai-q6-mi2s.5", "msm-dai-q6-mi2s.6",
		"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",
		"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293",
		"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
		"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", "cajon_codec";
		};
		};

		&blsp1_uart1 {

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

+84 −0

Original line number	Diff line number	Diff line
		@@ -1391,5 +1391,89 @@
		};
		};
		};

		vdd_spkdrv {
		vdd_spkdrv_act: vdd_spkdrv_on {
		mux {
		pins = "gpio4";
		function = "gpio";
		};
		config {
		pins = "gpio4";
		drive-strength = <8>;
		};
		};
		vdd_spkdrv_sus: vdd_spkdrv_off {
		mux {
		pins = "gpio4";
		function = "gpio";
		};

		config {
		pins = "gpio4";
		drive-strength = <2>;
		bias-disable;
		};
		};
		};

		cdc-pdm-lines {
		cdc_pdm_lines_act: pdm_lines_on {
		mux {
		pins = "gpio59", "gpio60", "gpio61",
		"gpio62", "gpio63", "gpio64";
		function = "cdc_pdm0";
		};

		config {
		pins = "gpio59", "gpio60", "gpio61",
		"gpio62", "gpio63", "gpio64";
		drive-strength = <8>;
		};
		};
		cdc_pdm_lines_sus: pdm_lines_off {
		mux {
		pins = "gpio59", "gpio60", "gpio61",
		"gpio62", "gpio63", "gpio64";
		function = "cdc_pdm0";
		};

		config {
		pins = "gpio59", "gpio60", "gpio61",
		"gpio62", "gpio63", "gpio64";
		drive-strength = <2>;
		bias-disable;
		};
		};
		};

		cross-conn-det {
		cross_conn_det_act: lines_on {
		mux {
		pins = "gpio97";
		function = "gpio";
		};

		config {
		pins = "gpio97";
		drive-strength = <8>;
		output-low;
		bias-pull-down;
		};
		};

		cross_conn_det_sus: lines_off {
		mux {
		pins = "gpio97";
		function = "gpio";
		};

		config {
		pins = "gpio97";
		drive-strength = <2>;
		bias-pull-down;
		};
		};
		};
		};
		};

arch/arm/boot/dts/qcom/msm8909-pm8916-mtp.dtsi

+15 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,21 @@

		};

		&audio_codec_mtp {
		qcom,model = "msm8909-pm8916-snd-card";
		pinctrl-names =
		"all_off",
		"pri_i2s_act",
		"us_eu_gpio_act",
		"pri_i2s_us_eu_gpio_act";
		pinctrl-0 = <&cdc_pdm_lines_sus &cross_conn_det_sus>;
		pinctrl-1 = <&cdc_pdm_lines_act &cross_conn_det_sus>;
		pinctrl-2 = <&cdc_pdm_lines_sus &cross_conn_det_act>;
		pinctrl-3 = <&cdc_pdm_lines_act &cross_conn_det_act>;
		asoc-codec = <&stub_codec>, <&pm8916_tombak_dig>;
		asoc-codec-names = "msm-stub-codec.1", "cajon_codec";
		};

		&sdhc_1 {
		vdd-supply = <&pm8916_l8>;
		vdd-io-supply = <&pm8916_l5>;

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

+213 −0

Original line number	Diff line number	Diff line
		@@ -1239,6 +1239,219 @@
		memory-region = <&venus_qseecom_mem>;
		};

		pcm0: qcom,msm-pcm {
		compatible = "qcom,msm-pcm-dsp";
		qcom,msm-pcm-dsp-id = <0>;
		};

		routing: qcom,msm-pcm-routing {
		compatible = "qcom,msm-pcm-routing";
		};

		pcm1: qcom,msm-pcm-low-latency {
		compatible = "qcom,msm-pcm-dsp";
		qcom,msm-pcm-dsp-id = <1>;
		qcom,msm-pcm-low-latency;
		qcom,latency-level = "regular";
		};

		pcm2: qcom,msm-ultra-low-latency {
		compatible = "qcom,msm-pcm-dsp";
		qcom,msm-pcm-dsp-id = <2>;
		qcom,msm-pcm-low-latency;
		qcom,latency-level = "ultra";
		};

		lpa: qcom,msm-pcm-lpa {
		compatible = "qcom,msm-pcm-lpa";
		};

		compress: qcom,msm-compress-dsp {
		compatible = "qcom,msm-compress-dsp";
		};

		voip: qcom,msm-voip-dsp {
		compatible = "qcom,msm-voip-dsp";
		};

		voice: qcom,msm-pcm-voice {
		compatible = "qcom,msm-pcm-voice";
		qcom,destroy-cvd;
		qcom,vote-bms;
		};

		stub_codec: qcom,msm-stub-codec {
		compatible = "qcom,msm-stub-codec";
		};

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

		afe: qcom,msm-pcm-afe {
		compatible = "qcom,msm-pcm-afe";
		};

		voice_svc: qcom,msm-voice-svc {
		compatible = "qcom,msm-voice-svc";
		};

		loopback: qcom,msm-pcm-loopback {
		compatible = "qcom,msm-pcm-loopback";
		};

		qcom,msm-dai-mi2s {
		compatible = "qcom,msm-dai-mi2s";
		dai_mi2s0: 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>;
		};

		dai_mi2s1: 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>;
		};

		dai_mi2s3: 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>;
		};

		dai_mi2s5: qcom,msm-dai-q6-mi2s-quin {
		compatible = "qcom,msm-dai-q6-mi2s";
		qcom,msm-dai-q6-mi2s-dev-id = <5>;
		qcom,msm-mi2s-rx-lines = <1>;
		qcom,msm-mi2s-tx-lines = <2>;
		};

		dai_mi2s2: 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>;
		};

		dai_mi2s6: qcom,msm-dai-q6-mi2s-senary {
		compatible = "qcom,msm-dai-q6-mi2s";
		qcom,msm-dai-q6-mi2s-dev-id = <6>;
		qcom,msm-mi2s-rx-lines = <0>;
		qcom,msm-mi2s-tx-lines = <3>;
		};
		};

		lsm: qcom,msm-lsm-client {
		compatible = "qcom,msm-lsm-client";
		};

		qcom,msm-dai-q6 {
		compatible = "qcom,msm-dai-q6";
		bt_sco_rx: qcom,msm-dai-q6-bt-sco-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <12288>;
		};

		bt_sco_tx: qcom,msm-dai-q6-bt-sco-tx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <12289>;
		};

		int_fm_rx: qcom,msm-dai-q6-int-fm-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <12292>;
		};

		int_fm_tx: qcom,msm-dai-q6-int-fm-tx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <12293>;
		};

		afe_pcm_rx: qcom,msm-dai-q6-be-afe-pcm-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <224>;
		};

		afe_pcm_tx: qcom,msm-dai-q6-be-afe-pcm-tx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <225>;
		};

		afe_proxy_rx: qcom,msm-dai-q6-afe-proxy-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <241>;
		};

		afe_proxy_tx: qcom,msm-dai-q6-afe-proxy-tx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <240>;
		};

		incall_record_rx: qcom,msm-dai-q6-incall-record-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <32771>;
		};

		incall_record_tx: qcom,msm-dai-q6-incall-record-tx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <32772>;
		};

		incall_music_rx: qcom,msm-dai-q6-incall-music-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <32773>;
		};

		incall_music_2_rx: qcom,msm-dai-q6-incall-music-2-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <32770>;
		};
		};

		hostless: qcom,msm-pcm-hostless {
		compatible = "qcom,msm-pcm-hostless";
		};

		dai_pri_auxpcm: 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,adsprpc-mem {
		compatible = "qcom,msm-adsprpc-mem-region";
		memory-region = <&modem_adsp_mem>;
		};

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

		qcom,memshare {
		compatible = "qcom,memshare";