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

Commit f5198bd2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: update setting for tert MI2S on Kona"

parents 646abb1b fb95308f
Loading
Loading
Loading
Loading
+15 −5
Original line number Diff line number Diff line
@@ -21,12 +21,22 @@

&dai_mi2s2 {
	qcom,msm-mi2s-tx-lines = <1>;
	pinctrl-names = "default", "sleep";
};

&q6core {
	cdc_tert_mi2s_gpios: msm_cdc_pinctrl_tert {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
				&tert_mi2s_sd0_active>;
		pinctrl-1 = <&tert_mi2s_sck_sleep &tert_mi2s_ws_sleep
				&tert_mi2s_sd0_sleep>;
	};
};

&kona_snd {
	qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;
};

&qupv3_se1_i2c {
	status = "ok";
+15 −5
Original line number Diff line number Diff line
@@ -21,12 +21,22 @@

&dai_mi2s2 {
	qcom,msm-mi2s-tx-lines = <1>;
	pinctrl-names = "default", "sleep";
};

&q6core {
	cdc_tert_mi2s_gpios: msm_cdc_pinctrl_tert {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
				&tert_mi2s_sd0_active>;
		pinctrl-1 = <&tert_mi2s_sck_sleep &tert_mi2s_ws_sleep
				&tert_mi2s_sd0_sleep>;
	};
};

&kona_snd {
	qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;
};

&qupv3_se1_i2c {
	status = "ok";
+13 −5
Original line number Diff line number Diff line
@@ -27,12 +27,18 @@

&dai_mi2s2 {
	qcom,msm-mi2s-tx-lines = <1>;
	pinctrl-names = "default", "sleep";
};

&q6core {
	cdc_tert_mi2s_gpios: msm_cdc_pinctrl_tert {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
				&tert_mi2s_sd0_active>;
		pinctrl-1 = <&tert_mi2s_sck_sleep &tert_mi2s_ws_sleep
				&tert_mi2s_sd0_sleep>;
	};
};

&kona_snd {
	qcom,model = "kona-qrd-snd-card";
@@ -110,6 +116,8 @@
	qcom,msm-mbhc-usbc-audio-supported = <1>;
	qcom,msm-mbhc-hphl-swh = <0>;
	qcom,msm-mbhc-gnd-swh = <0>;

	qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;
};

&qupv3_se1_i2c {