Merge "ARM: dts: msm: Add Euro usbc support for 670 internal codec" (e03bdda8) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/sdm670-audio-overlay.dtsi

+0 −7

Original line number	Diff line number	Diff line
		@@ -121,13 +121,6 @@
		pinctrl-1 = <&wcd_usbc_analog_en1_idle>;
		};

		wcd_gnd_mic_swap_gpio: msm_cdc_pinctrl_gnd_mic_swap {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&wcd_gnd_mic_swap_active>;
		pinctrl-1 = <&wcd_gnd_mic_swap_idle>;
		};

		cdc_pdm_gpios: cdc_pdm_pinctrl {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";

+4 −1

Original line number	Diff line number	Diff line
		@@ -14,5 +14,8 @@
		&int_codec {
		qcom,msm-mbhc-usbc-audio-supported = <1>;
		qcom,usbc-analog-en1-gpio = <&wcd_usbc_analog_en1_gpio>;
		qcom,us-euro-gpios = <&wcd_gnd_mic_swap_gpio>;
		qcom,usbc-analog-en2-gpio = <&tlmm 40 0>;
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&wcd_usbc_analog_en2_active>;
		pinctrl-1 = <&wcd_usbc_analog_en2_idle>;
		};

+3 −3

Original line number	Diff line number	Diff line
		@@ -1521,8 +1521,8 @@
		};
		};

		wcd_gnd_mic_swap {
		wcd_gnd_mic_swap_idle: wcd_gnd_mic_swap_idle {
		wcd_usbc_analog_en2 {
		wcd_usbc_analog_en2_idle: wcd_usbc_ana_en2_idle {
		mux {
		pins = "gpio40";
		function = "gpio";
		@@ -1536,7 +1536,7 @@
		};
		};

		wcd_gnd_mic_swap_active: wcd_gnd_mic_swap_active {
		wcd_usbc_analog_en2_active: wcd_usbc_ana_en2_active {
		mux {
		pins = "gpio40";
		function = "gpio";