Merge "ARM: dts: msm: External codec audio changes for msm8953" (ad48d258) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/soundwire/swr-wcd-ctrl.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ Required properties:
		which the swr-devid is <0x0 0x032000> where 0x03 represents
		device Unique_ID, 0x20 represents Part_Id1 and 0x00
		represents part_Id2.
		- qcom,swr-num-dev : Maximum number of possible slave devices.
		- #address-cells = <2>;
		- #size-cells = <0>;

		@@ -16,6 +17,7 @@ Optional property:
		Example:
		swr_master {
		compatible = "qcom,swr-wcd";
		qcom,swr-num-dev = <2>;
		#address-cells = <2>;
		#size-cells = <0>;

arch/arm64/boot/dts/qcom/msm8953-audio.dtsi

+70 −12

Original line number	Diff line number	Diff line
		@@ -248,16 +248,23 @@
		"SpkrRight IN", "SPK2 OUT";

		qcom,tasha-mclk-clk-freq = <9600000>;
		qcom,cdc-us-euro-gpios = <&tlmm 63 0>;
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,cdc-us-eu-gpios = <&cdc_us_euro_sw>;
		qcom,quin-mi2s-gpios = <&cdc_quin_mi2s_gpios>;

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
		<&loopback>, <&compress>, <&hostless>,
		<&afe>, <&lsm>, <&routing>;
		<&afe>, <&lsm>, <&routing>, <&cpe>, <&compr>,
		<&pcm_noirq>;
		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-pcm-routing", "msm-cpe-lsm",
		"msm-compr-dsp", "msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_pri_auxpcm>,
		<&dai_mi2s2>, <&dai_mi2s3>, <&dai_mi2s5>,
		@@ -289,9 +296,6 @@

		asoc-codec = <&stub_codec>, <&hdmi_dba>;
		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-dba-codec-rx";
		qcom,cdc-us-euro-gpios = <&tlmm 63 0>;
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,wsa-max-devs = <2>;
		qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,
		@@ -300,11 +304,19 @@
		"SpkrLeft", "SpkrRight";
		};

		cpe: qcom,msm-cpe-lsm {
		compatible = "qcom,msm-cpe-lsm";
		};

		wcd9xxx_intc: wcd9xxx-irq {
		status = "disabled";
		compatible = "qcom,wcd9xxx-irq";
		interrupt-controller;
		#interrupt-cells = <1>;
		interrupt-parent = <&tlmm>;
		interrupts = <73 0>;
		qcom,gpio-connect = <&tlmm 73 0>;
		pinctrl-names = "default";
		pinctrl-0 = <&wcd_intr_default>;
		};

		clock_audio: audio_ext_clk {
		@@ -313,29 +325,64 @@
		clock-names = "osr_clk";
		qcom,node_has_rpm_clock;
		#clock-cells = <1>;
		pinctrl-names = "active", "sleep";
		pinctrl-0 = <&tasha_mclk_default>;
		pinctrl-1 = <&tasha_mclk_default>;
		qcom,audio-ref-clk-gpio = <&pm8953_gpios 1 0>;
		qcom,lpass-mclk-id = "pri_mclk";
		clocks = <&clock_gcc clk_div_clk2>;
		pinctrl-0 = <&cdc_mclk2_sleep>;
		pinctrl-1 = <&cdc_mclk2_active>;
		};

		wcd_rst_gpio: wcd_gpio_ctrl {
		wcd_rst_gpio: msm_cdc_pinctrl@67 {
		status = "disabled";
		qcom,cdc-rst-n-gpio = <&tlmm 67 0>;
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&cdc_reset_active>;
		pinctrl-1 = <&cdc_reset_sleep>;
		};
		};

		&slim_msm {
		status = "disabled";

		dai_slim: msm_dai_slim {
		status = "disabled";
		compatible = "qcom,msm-dai-slim";
		elemental-addr = [ff ff ff fe 17 02];
		};

		wcd9335: tasha_codec {
		status = "disabled";
		compatible = "qcom,tasha-slim-pgd";
		elemental-addr = [00 01 A0 01 17 02];

		qcom,cdc-slim-ifd = "tasha-slim-ifd";
		qcom,cdc-slim-ifd-elemental-addr = [00 00 A0 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>;

		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;

		clock-names = "wcd_clk", "wcd_native_clk";
		clocks = <&clock_audio clk_audio_pmi_clk>,
		<&clock_audio clk_audio_ap_clk2>;

		qcom,cdc-reset-gpio = <&tlmm 67 0>;
		qcom,cdc-static-supplies =
		"cdc-vdd-buck",
		"cdc-buck-sido",
		"cdc-vdd-tx-h",
		"cdc-vdd-rx-h",
		"cdc-vdd-px";

		qcom,cdc-on-demand-supplies = "cdc-vdd-mic-bias";
		qcom,cdc-micbias1-mv = <1800>;
		qcom,cdc-micbias2-mv = <1800>;
		qcom,cdc-micbias3-mv = <1800>;
		qcom,cdc-micbias4-mv = <1800>;

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

		cdc-vdd-buck-supply = <&eldo2_8953>;
		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;
		@@ -372,6 +419,17 @@
		qcom,master-en = <1>;
		qcom,out-strength = <2>;
		};

		tasha_mclk {
		tasha_mclk_default: tasha_mclk_default{
		pins = "gpio1";
		function = "func1";
		qcom,drive-strength = <2>;
		power-source = <0>;
		bias-disable;
		output-low;
		};
		};
		};

		&pm8953_1 {

arch/arm64/boot/dts/qcom/msm8953-ext-codec-mtp.dts

+72 −0

Original line number	Diff line number	Diff line
		@@ -26,3 +26,75 @@
		qcom,pmic-id = <0x010016 0x010011 0x0 0x0>;
		};

		&int_codec {
		status = "disabled";
		};

		&pmic_analog_codec {
		status = "disabled";
		};

		&wsa881x_i2c_f {
		status = "disabled";
		};

		&wsa881x_i2c_45 {
		status = "disabled";
		};

		&cdc_pri_mi2s_gpios {
		status = "disabled";
		};

		&wsa881x_analog_vi_gpio {
		status = "disabled";
		};

		&wsa881x_analog_clk_gpio {
		status = "disabled";
		};

		&wsa881x_analog_reset_gpio {
		status = "disabled";
		};

		&cdc_comp_gpios {
		status = "disabled";
		};

		&slim_msm {
		status = "okay";
		};

		&dai_slim {
		status = "okay";
		};

		&wcd9xxx_intc {
		status = "okay";
		};

		&clock_audio {
		status = "okay";
		};

		&wcd9335 {
		status = "okay";
		};

		&cdc_us_euro_sw {
		status = "okay";
		};

		&cdc_quin_mi2s_gpios {
		status = "okay";
		};

		&wcd_rst_gpio {
		status = "okay";
		};

		&ext_codec {
		qcom,model = "msm8953-tasha-snd-card";
		status = "okay";
		};

arch/arm64/boot/dts/qcom/msm8953-wsa881x.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		tasha_codec {
		swr_master {
		compatible = "qcom,swr-wcd";
		qcom,swr-num-dev = <2>;
		#address-cells = <2>;
		#size-cells = <0>;