Merge "ARM: dts: msm: Add device tree node to detect wcd9330 codec" (dacafe8c) · Commits · e / devices / android_kernel_sony_msm8994

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,13 @@
		qcom,ext-mclk-gpio = <&msmgpio 47 0>;
		};

		sound-9330 {
		qcom,model = "apq8084-tomtom-cdp-snd-card";
		qcom,hdmi-audio-rx;
		qcom,cdc-micbias2-headset-only;
		qcom,ext-mclk-gpio = <&msmgpio 47 0>;
		};

		gpio_keys {
		compatible = "gpio-keys";
		input-name = "gpio-keys";
		@@ -424,6 +431,18 @@

		qcom,cdc-on-demand-supplies = "cdc-vdd-spkdrv";
		};

		tomtom_codec {
		qcom,cdc-micbias1-ext-cap;
		qcom,cdc-micbias3-ext-cap;
		qcom,cdc-micbias4-ext-cap;

		cdc-vdd-spkdrv-supply = <&hdmi_vreg>;
		qcom,cdc-vdd-spkdrv-voltage = <5000000 5000000>;
		qcom,cdc-vdd-spkdrv-current = <1250000>;

		qcom,cdc-on-demand-supplies = "cdc-vdd-spkdrv";
		};
		};

		&i2c_1 {

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

+40 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,31 @@
		qcom,ext-mclk-gpio = <&msmgpio 47 0>;
		};

		sound-9330 {
		qcom,model = "apq8084-tomtom-mtp-snd-card";

		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"LDO_H", "MCLK",
		"AIF4 MAD", "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",
		"DMIC3", "MIC BIAS3 External",
		"MIC BIAS3 External", "Digital Mic3";

		qcom,hdmi-audio-rx;
		qcom,cdc-micbias2-headset-only;
		qcom,ext-mclk-gpio = <&msmgpio 47 0>;
		};

		i2c@f9926000 { /* BLSP1 QUP4 */
		nfc-nci@0e {
		compatible = "qcom,nfc-nci";
		@@ -223,6 +248,21 @@

		qcom,cdc-on-demand-supplies = "cdc-vdd-spkdrv";
		};

		tomtom_codec {
		qcom,cdc-micbias1-ext-cap;
		qcom,cdc-micbias3-ext-cap;

		/*
		* spkrdrv supply in MTP device is from VPH_PWR which is
		* always ON. Give a dummy supply to make codec driver happy.
		*/
		cdc-vdd-spkdrv-supply = <&vph_pwr_vreg>;
		qcom,cdc-vdd-spkdrv-voltage = <0 0>;
		qcom,cdc-vdd-spkdrv-current = <0>;

		qcom,cdc-on-demand-supplies = "cdc-vdd-spkdrv";
		};
		};

		&i2c_1 {

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

+102 −0

Original line number	Diff line number	Diff line
		@@ -782,6 +782,67 @@
		qcom,cdc-slim-ifd-elemental-addr = [00 00 A0 00 17 02];
		qcom,cdc-dmic-sample-rate = <4800000>;
		};

		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 30 31>;

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

		cdc-vdd-buck-supply = <&pma8084_s5>;
		qcom,cdc-vdd-buck-voltage = <2150000 2150000>;
		qcom,cdc-vdd-buck-current = <650000>;

		cdc-vdd-tx-h-supply = <&pma8084_s4>;
		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;
		qcom,cdc-vdd-tx-h-current = <25000>;

		cdc-vdd-rx-h-supply = <&pma8084_s4>;
		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;
		qcom,cdc-vdd-rx-h-current = <25000>;

		cdc-vddpx-1-supply = <&pma8084_s4>;
		qcom,cdc-vddpx-1-voltage = <1800000 1800000>;
		qcom,cdc-vddpx-1-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-vddcx-1-supply = <&pma8084_l1>;
		qcom,cdc-vddcx-1-voltage = <1225000 1225000>;
		qcom,cdc-vddcx-1-current = <10000>;

		cdc-vddcx-2-supply = <&pma8084_l1>;
		qcom,cdc-vddcx-2-voltage = <1225000 1225000>;
		qcom,cdc-vddcx-2-current = <10000>;

		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-variant = "WCD9330";
		};
		};

		i2c_0: i2c@f9925000 { /* BLSP1 QUP3 */
		@@ -3301,6 +3362,47 @@
		qcom,sec-auxpcm-gpio-dout = <&msmgpio 85 0>;
		};

		sound-9330 {
		compatible = "qcom,apq8084-audio-tomtom";
		qcom,model = "apq8084-tomtom-snd-card";

		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"LDO_H", "MCLK",
		"AIF4 MAD", "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 BIAS3 External",
		"MIC BIAS3 External", "Digital Mic1",
		"DMIC2", "MIC BIAS4 External",
		"MIC BIAS4 External", "Digital Mic2",
		"DMIC3", "MIC BIAS1 External",
		"MIC BIAS1 External", "Digital Mic3",
		"DMIC4", "MIC BIAS1 External",
		"MIC BIAS1 External", "Digital Mic4",
		"DMIC5", "MIC BIAS3 External",
		"MIC BIAS3 External", "Digital Mic5",
		"DMIC6", "MIC BIAS3 External",
		"MIC BIAS3 External", "Digital Mic6";

		qcom,tomtom-mclk-clk-freq = <9600000>;
		qcom,prim-auxpcm-gpio-clk = <&msmgpio 87 0>;
		qcom,prim-auxpcm-gpio-sync = <&msmgpio 88 0>;
		qcom,prim-auxpcm-gpio-din = <&msmgpio 89 0>;
		qcom,prim-auxpcm-gpio-dout = <&msmgpio 90 0>;
		qcom,prim-auxpcm-gpio-set = "prim-gpio-tert";
		qcom,sec-auxpcm-gpio-clk = <&msmgpio 82 0>;
		qcom,sec-auxpcm-gpio-sync = <&msmgpio 83 0>;
		qcom,sec-auxpcm-gpio-din = <&msmgpio 84 0>;
		qcom,sec-auxpcm-gpio-dout = <&msmgpio 85 0>;
		};

		qcom,msm-adsp-loader {
		compatible = "qcom,adsp-loader";
		qcom,adsp-state = <0>;