Merge "ARM: dts: msm: Add sound node for 8996 dtp" (cb0e3fce) · Commits · e / devices / android_kernel_xiaomi_markw

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

+44 −28

Original line number	Diff line number	Diff line
		@@ -65,15 +65,6 @@
		status = "okay";
		};

		gpio@c200 { /* GPIO 3 SPKR_SD_N */
		qcom,mode = <1>; /* DIGITAL OUT */
		qcom,pull = <5>; /* No Pull */
		qcom,vin-sel = <2>; /* 1.8 */
		qcom,src-sel = <0>; /* CONSTANT */
		qcom,master-en = <1>; /* ENABLE GPIO */
		status = "okay";
		};

		gpio@c400 { /* GPIO 5 - USB3 OTG SWITCH EN */
		qcom,mode = <1>; /* Digital output */
		qcom,vin-sel = <2>; /* 1.8 */
		@@ -83,14 +74,6 @@
		status = "okay";
		};

		gpio@c900 { /* GPIO 10 - HPH_EN1 */
		qcom,mode = <1>;
		qcom,pull = <5>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <2>;
		qcom,master-en = <1>;
		status = "okay";
		};
		};

		&pmi8994_mpps {
		@@ -169,17 +152,6 @@
		status = "okay";
		};

		gpio@cc00 { /* GPIO 13 - HPH_EN0 */
		qcom,mode = <1>;
		qcom,output-type = <0>;
		qcom,pull = <5>;
		qcom,vin-sel = <2>;
		qcom,out-strength = <1>;
		qcom,src-sel = <2>;
		qcom,master-en = <1>;
		status = "okay";
		};

		gpio@ce00 { /* GPIO 15 */
		qcom,mode = <1>;
		qcom,output-type = <0>;
		@@ -489,6 +461,50 @@
		debounce-interval = <15>;
		};
		};

		sound {
		status="disabled";
		};

		sound-9335 {
		qcom,model = "msm8996-dtp-snd-card";

		qcom,audio-routing =
		"AIF4 VI", "MCLK",
		"RX_BIAS", "MCLK",
		"AMIC2", "MIC BIAS2",
		"MIC BIAS2", "Headset Mic",
		"DMIC0", "MIC BIAS1",
		"MIC BIAS1", "Digital Mic0",
		"DMIC2", "MIC BIAS3",
		"MIC BIAS3", "Digital Mic2",
		"DMIC3", "MIC BIAS3",
		"MIC BIAS3", "Digital Mic3",
		"SpkrLeft IN", "SPK1 OUT";

		qcom,msm-mbhc-hphl-swh = <1>;
		qcom,msm-mbhc-gnd-swh = <0>;

		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1";
		qcom,aux-codec = <&wsa881x_1>;
		};
		};

		&slim_msm {
		tasha_codec {
		swr_master {
		compatible = "qcom,swr-wcd";
		#address-cells = <2>;
		#size-cells = <0>;

		wsa881x_1: wsa881x@20170211 {
		compatible = "qcom,wsa881x";
		reg = <0x00 0x20170211>;
		qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;
		};
		};
		};
		};

		&pmi8994_haptics {