Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a24286d5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM:dts: SXR DP audio implementation"

parents 79a38eee d6256c8e
Loading
Loading
Loading
Loading
+80 −1
Original line number Diff line number Diff line
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2017-2020, 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
@@ -308,5 +308,84 @@
				input-enable;
			};
		};

		quat_mi2s_sck_active: quat_mi2s_sck_active {
			mux {
				pins = "gpio23";
				function = "func2";
			};

			config {
				pins = "gpio23";
				drive-strength = <2>;   /* 2 mA */
				output-low;
			};
		};

		quat_mi2s_sck_sleep: quat_mi2s_sck_sleep {
			mux {
				pins = "gpio23";
				function = "func2";
			};

			config {
				pins = "gpio23";
				drive-strength = <2>;   /* 2 mA */
				pull-down;
			};
		};

		quat_mi2s_ws_active: quat_mi2s_ws_active {
			mux {
				pins = "gpio24";
				function = "func2";
			};

			config {
				pins = "gpio24";
				drive-strength = <2>;   /* 2 mA */
				output-low;
			};
		};

		quat_mi2s_ws_sleep: quat_mi2s_ws_sleep {
			mux {
				pins = "gpio24";
				function = "func2";
			};

			config {
				pins = "gpio24";
				drive-strength = <2>;   /* 2 mA */
				pull-down;
			};
		};

		quat_mi2s_d0_active: quat_mi2s_d0_active {
			mux {
				pins = "gpio25";
				function = "func2";
			};

			config {
				pins = "gpio25";
				drive-strength = <2>;   /* 2 mA */
				bias-disable;
				input-enable;
			};
		};

		quat_mi2s_d0_sleep: quat_mi2s_d0_sleep {
			mux {
				pins = "gpio25";
				function = "func2";
			};

			config {
				pins = "gpio25";
				drive-strength = <2>;   /* 2 mA */
			};
		};

	};
};
+26 −1
Original line number Diff line number Diff line
@@ -265,6 +265,19 @@
		};
	};

	quat_mi2s_gpios: quat_mi2s_pinctrl {
		status = "ok";
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&quat_mi2s_sck_active
				 &quat_mi2s_ws_active
				 &quat_mi2s_d0_active>;
		pinctrl-1 = <&quat_mi2s_sck_sleep
				 &quat_mi2s_ws_sleep
				 &quat_mi2s_d0_sleep>;
		qcom,lpi-gpios;
	};

};


@@ -437,7 +450,7 @@
};

&tavil_snd {
	qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;
	qcom,msm-mi2s-master = <1>, <1>, <1>, <0>, <1>;
	qcom,audio-routing =
		"AIF4 VI", "MCLK",
		"RX_BIAS", "MCLK",
@@ -466,6 +479,8 @@
		"MIC BIAS3", "Digital Mic5",
		"SpkrLeft IN", "SPK1 OUT",
		"SpkrRight IN", "SPK2 OUT";

	qcom,quat-mi2s-gpios = <&quat_mi2s_gpios>;
	qcom,msm-mbhc-hphl-swh = <1>;
	qcom,msm-mbhc-gnd-swh = <1>;
	qcom,hph-en0-gpio = <&tavil_hph_en0>;
@@ -493,3 +508,13 @@
&pm660_charger {
	qcom,ufp-only-mode;
};

&dai_mi2s3 {
	qcom,msm-mi2s-rx-lines = <0>;
	qcom,msm-mi2s-tx-lines = <1>;

};

&cdc_pdm_gpios {
	status = "disabled";
};