Merge "ARM: dts: msm: add support for external codec for 8916" (c12d8cb0) · Commits · e / devices / android_kernel_sony_msm8994

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

+39 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,45 @@
		pinctrl-0 = <&cdc_pdm_lines_act>;
		pinctrl-1 = <&cdc_pdm_lines_sus>;
		};

		sound-9306 {
		compatible = "qcom,msm8x16-audio-codec";
		qcom,model = "msm8x16-tapan-snd-card";
		qcom,msm-snd-card-id = <1>;
		qcom,msm-codec-type = "external";
		qcom,tapan-mclk-clk-freq = <9600000>;
		qcom,prim-auxpcm-gpio-clk = <&msm_gpio 63 0>;
		qcom,prim-auxpcm-gpio-sync = <&msm_gpio 64 0>;
		qcom,prim-auxpcm-gpio-din = <&msm_gpio 65 0>;
		qcom,prim-auxpcm-gpio-dout = <&msm_gpio 66 0>;
		qcom,prim-auxpcm-gpio-set = "prim-gpio-prim";
		qcom,tapan-codec-9302;
		pinctrl-names = "ext_cdc_tlmm_lines_act",
		"ext_cdc_tlmm_lines_sus";
		pinctrl-0 = <&ext_cdc_tlmm_lines_act>;
		pinctrl-1 = <&ext_cdc_tlmm_lines_sus>;
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"LDO_H", "MCLK",
		"SPK_OUT", "MCLK",
		"SPK_OUT", "EXT_VDD_SPKR",
		"AMIC1", "MIC BIAS1 Internal1",
		"MIC BIAS1 Internal1", "Handset Mic",
		"AMIC2", "MIC BIAS2 External",
		"MIC BIAS2 External", "Headset Mic",
		"AMIC4", "MIC BIAS2 External",
		"MIC BIAS2 External", "ANCRight Headset Mic",
		"AMIC5", "MIC BIAS2 External",
		"MIC BIAS2 External", "ANCLeft Headset Mic",
		"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";
		};
		};

		&blsp1_uart2 {

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

+33 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,39 @@
		num_irqs = <122>;
		};
		};

		ext-cdc-tlmm-lines {
		qcom,pins = <&gp 116>, <&gp 112>, <&gp 117>,
		<&gp 118>, <&gp 119>;
		qcom,num-grp-pins = <5>;
		qcom,pin-func = <1>;
		label = "ext-cdc-tlmm-lines";
		ext_cdc_tlmm_lines_act: tlmm_lines_on {
		drive-strength = <8>;
		bias-pull-none;
		};
		ext_cdc_tlmm_lines_sus: tlmm_lines_off {
		drive-strength = <2>;
		bias-disable;
		};
		};

		ext-codec-lines {
		qcom,pins = <&gp 67>;
		qcom,num-grp-pins = <1>;
		qcom,pin-func = <0>;
		label = "ext-codec-lines";
		ext_codec_lines_act: lines_on {
		drive-strength = <8>;
		bias-disable;
		output-high;
		};
		ext_codec_lines_sus: lines_off {
		drive-strength = <2>;
		bias-disable;
		};
		};

		cdc-pdm-lines {
		qcom,pins = <&gp 63>, <&gp 64>, <&gp 65>,
		<&gp 66>, <&gp 67>, <&gp 68>;

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

+78 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,15 @@
		<0x0b002000 0x1000>;
		};

		wcd9xxx_intc: wcd9xxx_irq {
		compatible = "qcom,wcd9xxx-irq";
		interrupt-controller;
		#interrupt-cells = <1>;
		interrupt-parent = <&intc>;
		interrupts = <0 68 0>;
		interrupt-names = "cdc-int";
		};

		restart@4ab000 {
		compatible = "qcom,pshold";
		reg = <0x4ab000 0x4>;
		@@ -895,6 +904,13 @@
		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>;
		@@ -1366,6 +1382,68 @@
		qcom,bam-pipe-idx-cons = <6>;
		qcom,bam-pipe-idx-prod = <7>;
		qcom,master-id = <86>;
		wcd9xxx_codec@14 {
		compatible = "qcom,wcd9xxx-i2c";
		reg = <0x0d>;
		qcom,cdc-reset-gpio = <&msm_gpio 67 0>;
		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>;

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

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

		cdc-vdd-px-supply = <&pm8916_l6>;
		qcom,cdc-vdd-px-voltage = <1800000 1800000>;
		qcom,cdc-vdd-px-current = <25000>;

		cdc-vdd-cx-supply = <&pm8916_l2>;
		qcom,cdc-vdd-cx-voltage = <1200000 1200000>;
		qcom,cdc-vdd-cx-current = <2000>;

		cdc-vdd-buckhelper-supply = <&pm8916_l15>;
		qcom,cdc-vdd-buckhelper-voltage = <1775000 2125000>;
		qcom,cdc-vdd-buckhelper-current = <10000>;

		qcom,cdc-static-supplies = "cdc-vdd-h",
		"cdc-vdd-px",
		"cdc-vdd-cx";

		qcom,cdc-cp-supplies = "cdc-vdd-buck",
		"cdc-vdd-buckhelper";

		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-mclk-clk-rate = <9600000>;
		};

		wcd9xxx_codec@77 {
		compatible = "qcom,wcd9xxx-i2c";
		reg = <0x77>;
		};

		wcd9xxx_codec@66 {
		compatible = "qcom,wcd9xxx-i2c";
		reg = <0x66>;
		};

		wcd9xxx_codec@55 {
		compatible = "qcom,wcd9xxx-i2c";
		reg = <0x55>;
		};

		};

		i2c_5: i2c@78b9000 { /* BLSP1 QUP5 */