Merge "ARM: dts: mdm: Add I2S and AuxPCM modes for MDM9x07" (b09d91d0) · Commits · e / devices / android_kernel_xiaomi_markw

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

+106 −1

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
		@@ -367,6 +367,111 @@
		};
		};

		pmx_sec_mi2s {
		sec_mi2s_ws_active: sec_mi2s_ws_active {
		mux {
		pins = "gpio79";
		function = "sec_mi2s";
		};
		config {
		pins = "gpio79";
		drive-strength = <8>; /* 8 MA */
		bias-disable; /* No PULL */
		output-high;
		};
		};

		sec_mi2s_sck_active: sec_mi2s_sck_active {
		mux {
		pins = "gpio78";
		function = "sec_mi2s";
		};

		config {
		pins = "gpio78";
		drive-strength = <8>; /* 8 MA */
		bias-disable; /* No PULL */
		output-high;
		};
		};

		sec_mi2s_dout_active: sec_mi2s_dout_active {
		mux {
		pins = "gpio77";
		function = "sec_mi2s";
		};
		config {
		pins = "gpio77";
		drive-strength = <8>; /* 8 MA */
		bias-disable; /* No PULL */
		output-high;
		};
		};

		sec_mi2s_ws_sleep: sec_mi2s_ws_sleep {
		mux {
		pins = "gpio79";
		function = "sec_mi2s";
		};
		config {
		pins = "gpio79";
		drive-strength = <2>; /* 2 MA */
		bias-pull-down; /* PULL DOWN */
		};
		};

		sec_mi2s_sck_sleep: sec_mi2s_sck_sleep {
		mux {
		pins = "gpio78";
		function = "sec_mi2s";
		};
		config {
		pins = "gpio78";
		drive-strength = <2>; /* 2 MA */
		bias-pull-down; /* PULL DOWN */
		};
		};

		sec_mi2s_dout_sleep: sec_mi2s_dout_sleep {
		mux {
		pins = "gpio77";
		function = "sec_mi2s";
		};

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

		pmx_sec_mi2s_din {
		sec_mi2s_din_active: sec_mi2s_din_active {
		mux {
		pins = "gpio76";
		function = "sec_mi2s";
		};
		config {
		pins = "gpio76";
		drive-strength = <8>; /* 8 MA */
		bias-disable; /* No PULL */
		};
		};

		sec_mi2s_din_sleep: sec_mi2s_din_sleep {
		mux {
		pins = "gpio76";
		function = "sec_mi2s";
		};
		config {
		pins = "gpio76";
		drive-strength = <2>; /* 2 MA */
		bias-pull-down; /* PULL DOWN */
		};
		};
		};

		pmx_qdsd_clk {
		qdsd_clk_sdcard: clk_sdcard {
		config {

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

+25 −2

Original line number	Diff line number	Diff line
		@@ -761,6 +761,8 @@
		"MIC BIAS3 External", "Digital Mic3";

		qcom,tomtom-mclk-clk-freq = <12288000>;
		qcom,mi2s-interface-mode = "pri_mi2s_master", "sec_mi2s_master";
		qcom,auxpcm-interface-mode = "pri_pcm_master", "sec_pcm_master";
		asoc-platform = <&pcm0>, <&pcm1>, <&voip>, <&voice>,
		<&loopback>, <&hostless>, <&afe>, <&routing>,
		<&pcm_dtmf>, <&host_pcm>;
		@@ -769,13 +771,15 @@
		"msm-pcm-loopback", "msm-pcm-hostless",
		"msm-pcm-afe", "msm-pcm-routing",
		"msm-pcm-dtmf", "msm-voice-host-pcm";
		asoc-cpu = <&dai_pri_auxpcm>, <&mi2s_prim>, <&dtmf_tx>,
		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>,
		<&mi2s_prim>, <&mi2s_sec>, <&dtmf_tx>,
		<&rx_capture_tx>, <&rx_playback_rx>,
		<&tx_capture_tx>, <&tx_playback_rx>,
		<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
		<&afe_proxy_tx>, <&incall_record_rx>,
		<&incall_record_tx>, <&incall_music_rx>;
		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-mi2s.0",
		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
		"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
		"msm-dai-stub-dev.4", "msm-dai-stub-dev.5",
		"msm-dai-stub-dev.6", "msm-dai-stub-dev.7",
		"msm-dai-stub-dev.8", "msm-dai-q6-dev.224",
		@@ -932,6 +936,19 @@
		qcom,msm-auxpcm-interface = "primary";
		};

		dai_sec_auxpcm: qcom,msm-sec-auxpcm {
		compatible = "qcom,msm-auxpcm-dev";
		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
		qcom,msm-auxpcm-interface = "secondary";
		};

		qcom,msm-dai-mi2s {
		compatible = "qcom,msm-dai-mi2s";
		mi2s_prim: qcom,msm-dai-q6-mi2s-prim {
		@@ -949,6 +966,12 @@
		&pri_mi2s_dout_sleep
		&pri_mi2s_din_sleep>;
		};
		mi2s_sec: qcom,msm-dai-q6-mi2s-sec {
		compatible = "qcom,msm-dai-q6-mi2s";
		qcom,msm-dai-q6-mi2s-dev-id = <1>;
		qcom,msm-mi2s-rx-lines = <2>;
		qcom,msm-mi2s-tx-lines = <1>;
		};
		};

		qcom,msm-thermal {