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

Commit 20fcba32 authored by Neema Shetty's avatar Neema Shetty Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: Remove wcd9330 support on 8996 



MSM8996 V1 devices are no longer supported. Remove codec support for
wcd9330.

Change-Id: I1678ef7906097806d1d7548506d642101a6fe114
Signed-off-by: default avatarNeema Shetty <nshetty@codeaurora.org>
Signed-off-by: default avatarVidyakumar Athota <vathota@codeaurora.org>
parent 5fade566

arch/arm/boot/dts/qcom/msm8996-cdp.dtsi

+0 −15
Original line number Diff line number Diff line
@@ -463,14 +463,6 @@ 
};



&slim_msm {

	tomtom_codec {

		qcom,cdc-micbias2-headset-only;

		qcom,cdc-micbias1-ext-cap;

		qcom,cdc-micbias2-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;

	};



	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";
@@ -645,13 +637,6 @@ 
		};

	};



	sound {

		qcom,model = "msm8996-tomtom-cdp-snd-card";

		qcom,hdmi-audio-rx;

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

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

	};



	sound-9335 {

		qcom,model = "msm8996-tasha-cdp-snd-card";

		qcom,hdmi-audio-rx;

arch/arm/boot/dts/qcom/msm8996-fluid.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -441,14 +441,6 @@ 
		};

	};



	sound {

		qcom,model = "msm8996-tomtom-mtp-snd-card";

		qcom,hdmi-audio-rx;

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

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

				"msm-hdmi-audio-codec-rx";

	};



	sound-9335 {

		qcom,model = "msm8996-tasha-fluid-snd-card";

		qcom,hdmi-audio-rx;

arch/arm/boot/dts/qcom/msm8996-liquid.dtsi

+0 −16
Original line number Diff line number Diff line
@@ -480,14 +480,6 @@ 
		status = "ok";

	};





	sound {

		qcom,model = "msm8996-tomtom-mtp-snd-card";

		qcom,hdmi-audio-rx;

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

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

	};



	sound-9335 {

		qcom,model = "msm8996-tasha-mtp-snd-card";

		qcom,hdmi-audio-rx;
@@ -666,14 +658,6 @@ 
};



&slim_msm {

	tomtom_codec {

		qcom,cdc-micbias2-headset-only;

		qcom,cdc-micbias1-ext-cap;

		qcom,cdc-micbias2-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;

	};



	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

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

+0 −15
Original line number Diff line number Diff line
@@ -648,13 +648,6 @@ 
		};

	};



	sound {

		qcom,model = "msm8996-tomtom-mtp-snd-card";

		qcom,hdmi-audio-rx;

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

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

	};



	sound-9335 {

		qcom,model = "msm8996-tasha-mtp-snd-card";
@@ -878,14 +871,6 @@ 
};



&slim_msm {

	tomtom_codec {

		qcom,cdc-micbias2-headset-only;

		qcom,cdc-micbias1-ext-cap;

		qcom,cdc-micbias2-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;

	};



	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

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

+0 −131
Original line number Diff line number Diff line
@@ -822,72 +822,6 @@ 
			elemental-addr = [ff ff ff fe 17 02];

		};



		tomtom_codec {

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

			elemental-addr = [00 01 30 01 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 29

				      30 31>;



			qcom,cdc-reset-gpio = <&tlmm 64 0>;



			clock-names = "wcd_clk";

			clocks = <&clock_audio clk_audio_pmi_clk>;



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

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

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



			cdc-vdd-tx-h-supply = <&pm8994_s4>;

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

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



			cdc-vdd-rx-h-supply = <&pm8994_s4>;

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

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



			cdc-vddpx-1-supply = <&pm8994_s4>;

			qcom,cdc-vddpx-1-voltage = <1800000 1800000>;

			qcom,cdc-vddpx-1-current = <10000>;



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

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

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



			cdc-vddcx-1-supply = <&pm8994_l6>;

			qcom,cdc-vddcx-1-voltage = <1200000 1200000>;

			qcom,cdc-vddcx-1-current = <33000>;



			cdc-vddcx-2-supply = <&pm8994_l6>;

			qcom,cdc-vddcx-2-voltage = <1200000 1200000>;

			qcom,cdc-vddcx-2-current = <33000>;



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

						   "cdc-vdd-tx-h",

						   "cdc-vdd-rx-h",

						   "cdc-vddpx-1",

						   "cdc-vdd-a-1p2v",

						   "cdc-vddcx-1",

						   "cdc-vddcx-2";



			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-micbias4-cfilt-sel = <0x2>;

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

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

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

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

			qcom,cdc-mad-dmic-rate = <600000>;

			qcom,cdc-variant = "WCD9330";

		};



		tasha_codec {

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

			elemental-addr = [00 01 A0 01 17 02];
@@ -2798,71 +2732,6 @@ 
		hyplog-size-offset = <0x414>;    /* 0x066BFB34 */

	};



	sound {

		compatible = "qcom,msm8996-asoc-snd-tomtom";

		qcom,model = "msm8996-tomtom-snd-card";



		qcom,audio-routing =

			"AIF4 VI", "MCLK",

			"RX_BIAS", "MCLK",

			"LDO_H", "MCLK",

			"MADINPUT", "MCLK",

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

			"AMIC5", "MIC BIAS3 External",

			"MIC BIAS3 External", "Handset Mic",

			"AMIC6", "MIC BIAS4 External",

			"MIC BIAS4 External", "Analog Mic6",

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

			"DMIC5", "MIC BIAS4 External",

			"MIC BIAS4 External", "Digital Mic5",

			"DMIC6", "MIC BIAS4 External",

			"MIC BIAS4 External", "Digital Mic6";



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

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

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

				<&afe>, <&lsm>, <&routing>, <&cpe>, <&compr>;

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

				"msm-compr-dsp";

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

				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,

				<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,

				<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>, <&afe_pcm_rx>,

				<&afe_pcm_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music2_rx>,

				<&sb_5_rx>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.2",

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

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

				"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",

				"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",

				"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",

				"msm-dai-q6-dev.16395", "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", "msm-dai-q6-dev.16394";

		asoc-codec = <&stub_codec>;

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

	};



	sound-9335 {

		compatible = "qcom,msm8996-asoc-snd-tasha";

		qcom,model = "msm8996-tasha-snd-card";