Merge "ARM: dts: msm: add support for external codec on apq8009" (ea4d257a) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/apq8009-audio-external_codec.dtsi

+51 −57

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-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
		@@ -25,10 +25,8 @@

		&soc {
		sound-9335 {
		compatible = "qcom,msm8x16-audio-codec";
		qcom,model = "msm8x09-tasha9326-snd-card";
		qcom,msm-snd-card-id = <1>;
		qcom,msm-codec-type = "external";
		compatible = "qcom,apq8009-audio-i2s-codec";
		qcom,model = "apq8009-tashalite-snd-card";
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-mclk-freq = <9600000>;
		@@ -39,60 +37,42 @@
		"MADINPUT", "MCLK",
		"AMIC2", "MIC BIAS2",
		"MIC BIAS2", "Headset Mic",
		"AMIC3", "MIC BIAS2",
		"MIC BIAS2", "ANCRight Headset Mic",
		"AMIC4", "MIC BIAS2",
		"MIC BIAS2", "ANCLeft Headset Mic",
		"AMIC5", "MIC BIAS3",
		"MIC BIAS3", "Handset Mic",
		"AMIC6", "MIC BIAS4",
		"MIC BIAS4", "Analog Mic6",
		"DMIC0", "MIC BIAS1",
		"MIC BIAS1", "Digital Mic0",
		"DMIC1", "MIC BIAS1",
		"MIC BIAS1", "Digital Mic1",
		"DMIC2", "MIC BIAS2",
		"MIC BIAS3", "Digital Mic2",
		"MIC BIAS2", "Digital Mic2",
		"DMIC3", "MIC BIAS2",
		"MIC BIAS3", "Digital Mic3",
		"DMIC4", "MIC BIAS2",
		"MIC BIAS4", "Digital Mic4",
		"DMIC5", "MIC BIAS4",
		"MIC BIAS4", "Digital Mic5",
		"MIC BIAS2", "Digital Mic3",
		"SpkrLeft IN", "SPK1 OUT",
		"SpkrRight IN", "SPK2 OUT";

		qcom,msm-gpios =
		"pri_i2s",
		"quat_i2s",
		"us_eu_gpio";
		"quat_i2s";
		qcom,pinctrl-names =
		"all_off",
		"pri_i2s_act",
		"quat_i2s_act",
		"pri_i2s_quat_i2s_act",
		"us_eu_gpio_act",
		"pri_i2s_us_eu_gpio_act",
		"quat_i2s_us_eu_gpio_act",
		"pri_i2s_pri_i2s_us_eu_gpio_act";
		"pri_i2s_quat_i2s_act";
		pinctrl-names =
		"all_off",
		"pri_i2s_act",
		"quat_i2s_act",
		"pri_i2s_quat_i2s_act",
		"us_eu_gpio_act",
		"pri_i2s_us_eu_gpio_act",
		"quat_i2s_us_eu_gpio_act",
		"pri_i2s_pri_i2s_us_eu_gpio_act";
		pinctrl-0 = <&pri_mi2s_sleep &quat_mi2s_sleep &quat_mi2s_din_sleep &cross_conn_det_sus>;
		pinctrl-1 = <&pri_mi2s_active &quat_mi2s_sleep &quat_mi2s_din_sleep &cross_conn_det_sus>;
		pinctrl-2 = <&pri_mi2s_sleep &quat_mi2s_active &quat_mi2s_din_active &cross_conn_det_sus>;
		pinctrl-3 = <&pri_mi2s_active &quat_mi2s_active &quat_mi2s_din_active &cross_conn_det_sus>;
		pinctrl-4 = <&pri_mi2s_sleep &quat_mi2s_sleep &quat_mi2s_din_sleep &cross_conn_det_act>;
		pinctrl-5 = <&pri_mi2s_active &quat_mi2s_sleep &quat_mi2s_din_sleep &cross_conn_det_act>;
		pinctrl-6 = <&pri_mi2s_sleep &quat_mi2s_active &quat_mi2s_din_active &cross_conn_det_act>;
		pinctrl-7 = <&pri_mi2s_active &quat_mi2s_active &quat_mi2s_din_active &cross_conn_det_act>;
		qcom,cdc-us-euro-gpios = <&msm_gpio 97 0>;
		"pri_i2s_quat_i2s_act";
		pinctrl-0 = <&pri_mi2s_sleep &pri_mi2s_ws_sleep
		&pri_mi2s_dout_sleep &pri_mi2s_din_sleep
		&quat_mi2s_sleep &quat_mi2s_din_sleep>;
		pinctrl-1 = <&pri_mi2s_active &pri_mi2s_ws_active
		&pri_mi2s_dout_active &pri_mi2s_din_active
		&quat_mi2s_sleep &quat_mi2s_din_sleep>;
		pinctrl-2 = <&pri_mi2s_sleep &pri_mi2s_ws_sleep
		&pri_mi2s_dout_sleep &pri_mi2s_din_sleep
		&quat_mi2s_active &quat_mi2s_din_active>;
		pinctrl-3 = <&pri_mi2s_active &pri_mi2s_ws_active
		&pri_mi2s_dout_active &pri_mi2s_din_active
		&quat_mi2s_active &quat_mi2s_din_active>;

		asoc-platform = <&pcm0>, <&pcm1>, <&voip>, <&voice>,
		<&loopback>, <&compress>, <&hostless>,
		@@ -128,14 +108,21 @@
		"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293";
		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1";
		qcom,max-aux-codec = <2>;
		qcom,aux-codec = "wsa881x.21170213", "wsa881x.21170214";
		qcom,aux-codec-prefix = "SpkrLeft", "SpkrRight";
		qcom,wsa-max-devs = <2>;
		qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,
		<&wsa881x_213>, <&wsa881x_214>;
		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
		"SpkrLeft", "SpkrRight";
		};
		cpe: qcom,msm-cpe-lsm {
		compatible = "qcom,msm-cpe-lsm";
		};

		compress: qcom,msm-compress-dsp {
		compatible = "qcom,msm-compress-dsp";
		qcom,adsp-version = "MDSP 2.8";
		};

		wcd9xxx_intc: wcd9xxx-irq {
		compatible = "qcom,wcd9xxx-irq";
		interrupt-controller;
		@@ -143,14 +130,15 @@
		interrupt-parent = <&msm_gpio>;
		interrupts = <64 0>;
		interrupt-names = "cdc-int";
		qcom,gpio-connect = <&msm_gpio 64 0>;
		};

		clock_audio: audio_ext_clk {
		compatible = "qcom,audio-ref-clk";
		qcom,codec-mclk-clk-freq = <9600000>;
		qcom,lpass-clock = <1>;
		pinctrl-names = "i2s_mclk_sleep",
		"i2s_mclk_active";
		reg = <0x07702004>;
		pinctrl-names = "sleep", "active";
		pinctrl-0 = <&i2s_mclk_sleep>;
		pinctrl-1 = <&i2s_mclk_active>;
		#clock-cells = <1>;
		@@ -205,28 +193,34 @@
		qcom,cdc-variant = "WCD9335";

		clock-names = "wcd_clk";
		clocks = <&clock_audio clk_audio_ap_clk>;
		clocks = <&clock_audio clk_audio_lpass_mclk>;

		swr_master {
		compatible = "qcom,swr-wcd";
		#address-cells = <2>;
		#size-cells = <0>;
		wsa881x@21170214 {
		wsa881x_211:wsa881x@21170211 {
		compatible = "qcom,wsa881x";
		reg = <0x00 0x21170214>;
		pinctrl-names = "wsa_spkr_sd_act",
		"wsa_spkr_sd_sus";
		pinctrl-0 = <&wsa_spkr_sd_act>;
		pinctrl-1 = <&wsa_spkr_sd_sus>;
		reg = <0x00 0x21170211>;
		qcom,spkr-sd-n-gpio = <&msm_gpio 72 0>;
		};

		wsa881x_212:wsa881x@21170212 {
		compatible = "qcom,wsa881x";
		reg = <0x00 0x21170212>;
		qcom,spkr-sd-n-gpio = <&msm_gpio 73 0>;
		};

		wsa881x@21170213 {
		wsa881x_213:wsa881x@21170213 {
		compatible = "qcom,wsa881x";
		reg = <0x00 0x21170213>;
		pinctrl-names = "wsa_spkr_sd_act",
		"wsa_spkr_sd_sus";
		pinctrl-0 = <&wsa_spkr_sd_act>;
		pinctrl-1 = <&wsa_spkr_sd_sus>;
		qcom,spkr-sd-n-gpio = <&msm_gpio 72 0>;
		};

		wsa881x_214:wsa881x@21170214 {
		compatible = "qcom,wsa881x";
		reg = <0x00 0x21170214>;
		qcom,spkr-sd-n-gpio = <&msm_gpio 73 0>;
		};
		};
		};

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

+88 −39

Original line number	Diff line number	Diff line
		@@ -1512,13 +1512,11 @@
		label = "pri_mi2s";
		pri_mi2s_active: pri_mi2s_active {
		mux {
		pins = "gpio60", "gpio61",
		"gpio62", "gpio63";
		pins = "gpio60";
		function = "pri_mi2s_sck_a";
		};
		configs {
		pins = "gpio60", "gpio61",
		"gpio62", "gpio63";
		pins = "gpio60";
		drive-strength = <8>; /* 8 MA */
		bias-disable; /* No PULL */
		output-high;
		@@ -1526,17 +1524,95 @@
		};
		pri_mi2s_sleep: pri_mi2s_sleep {
		mux {
		pins = "gpio60", "gpio61",
		"gpio62", "gpio63";
		pins = "gpio60";
		function = "pri_mi2s_sck_a";
		};
		configs {
		pins = "gpio60", "gpio61",
		"gpio62", "gpio63";
		pins = "gpio60";
		drive-strength = <2>; /* 2 MA */
		bias-pull-down; /* PULL DOWN */
		};
		};

		pri_mi2s_ws_active: pri_mi2s_ws_active {
		mux {
		pins = "gpio61";
		function = "pri_mi2s_ws_a";
		};

		config {
		pins = "gpio61";
		drive-strength = <8>; /* 8 mA */
		bias-disable; /* NO PULL*/
		output-high;
		};
		};

		pri_mi2s_ws_sleep: pri_mi2s_ws_sleep {
		mux {
		pins = "gpio61";
		function = "pri_mi2s_ws_a";
		};

		config {
		pins = "gpio61";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* PULL DOWN */
		};
		};

		pri_mi2s_dout_active: pri_mi2s_dout_active {
		mux {
		pins = "gpio63";
		function = "pri_mi2s_data1_a";
		};

		config {
		pins = "gpio63";
		drive-strength = <8>; /* 8 mA */
		bias-disable; /* NO PULL*/
		output-high;
		};
		};

		pri_mi2s_dout_sleep: pri_mi2s_dout_sleep {
		mux {
		pins = "gpio63";
		function = "pri_mi2s_data1_a";
		};

		config {
		pins = "gpio63";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* PULL DOWN */
		};
		};

		pri_mi2s_din_sleep: pri_mi2s_din_sleep {
		mux {
		pins = "gpio62";
		function = "pri_mi2s_data0_a";
		};

		config {
		pins = "gpio62";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* PULL DOWN */
		};
		};

		pri_mi2s_din_active: pri_mi2s_din_active {
		mux {
		pins = "gpio62";
		function = "pri_mi2s_data0_a";
		};

		config {
		pins = "gpio62";
		drive-strength = <8>; /* 8 mA */
		bias-disable; /* NO PULL */
		};
		};
		};

		pmx_quat_mi2s {
		@@ -1544,7 +1620,7 @@
		quat_mi2s_active: quat_mi2s_active {
		mux {
		pins = "gpio0", "gpio1";
		function = "sec_mi2s_ws";
		function = "sec_mi2s";
		};
		configs {
		pins = "gpio0", "gpio1";
		@@ -1556,7 +1632,7 @@
		quat_mi2s_sleep: quat_mi2s_sleep {
		mux {
		pins = "gpio0", "gpio1";
		function = "sec_mi2s_ws";
		function = "sec_mi2s";
		};
		configs {
		pins = "gpio0", "gpio1";
		@@ -1571,7 +1647,7 @@
		quat_mi2s_din_active: quat_mi2s_din_active {
		mux {
		pins = "gpio2", "gpio3";
		function = "sec_mi2s_data0";
		function = "sec_mi2s";
		};
		configs {
		pins = "gpio2", "gpio3";
		@@ -1582,7 +1658,7 @@
		quat_mi2s_din_sleep: quat_mi2s_din_sleep {
		mux {
		pins = "gpio2", "gpio3";
		function = "sec_mi2s_data0";
		function = "sec_mi2s";
		};
		configs {
		pins = "gpio2", "gpio3";
		@@ -1592,32 +1668,5 @@
		};
		};

		wsa-spkr-sd {
		label = "wsa-spkr-sd";
		wsa_spkr_sd_act: lines_on {
		mux {
		pins = "gpio72", "gpio73";
		function = "gpio";
		};
		configs {
		pins = "gpio72", "gpio73";
		drive-strength = <8>;
		output-high;
		bias-pull-down;
		};
		};
		wsa_spkr_sd_sus: lines_off {
		mux {
		pins = "gpio72", "gpio73";
		function = "gpio";
		};
		configs {
		pins = "gpio72", "gpio73";
		drive-strength = <2>;
		output-low;
		bias-disable;
		};
		};
		};
		};
		};