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

Commit d816a87c 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 Lahaina"

parents 321cfd31 90f9f30b

qcom/lahaina-cdp.dtsi

+10 −7
Original line number Diff line number Diff line
@@ -201,17 +201,20 @@ 
	status = "ok";

};



&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>;

	};

};



&lahaina_snd {

	qcom,model = "lahaina-cdp-snd-card";

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

};



&usb1 {

qcom/lahaina-mtp.dtsi

+13 −7
Original line number Diff line number Diff line
@@ -182,14 +182,20 @@ 
	status = "ok";

};



&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>;

	};

};



&lahaina_snd {

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

};



&usb1 {

	extcon = <&extcon_usb1>;

qcom/lahaina-qrd-common.dtsi

+13 −9
Original line number Diff line number Diff line
@@ -97,6 +97,17 @@ 
	};

};



&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>;

	};

};



&lahaina_snd {

	qcom,model = "lahaina-qrd-snd-card";
@@ -164,6 +175,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>;

};



&usb1 {
@@ -214,15 +227,6 @@ 
	};

};



&dai_mi2s2 {

	qcom,msm-mi2s-tx-lines = <1>;

	pinctrl-names = "default", "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>;

};



&battery_charger {

	qcom,thermal-mitigation = <10000000 9500000 9000000 8500000 8000000

				7500000 7000000 6500000 6000000 5500000