Merge "ARM: dts: msm: update audio device tree node for kona devices" (75fa4f8d) · Commits · e / devices / android_kernel_fairphone_FP4

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

+65 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		*/

		#include <dt-bindings/clock/qcom,audio-ext-clk.h>
		@@ -177,6 +177,63 @@

		};

		&kona_snd {
		qcom,model = "kona-mtp-snd-card";
		qcom,msm-mi2s-master = <1>, <1>, <1>;
		qcom,audio-routing =
		"AMIC2", "MIC BIAS2",
		"MIC BIAS2", "Analog Mic2",
		"TX DMIC0", "MIC BIAS3",
		"MIC BIAS3", "Digital Mic0",
		"TX DMIC1", "MIC BIAS3",
		"MIC BIAS3", "Digital Mic1",
		"TX DMIC2", "MIC BIAS1",
		"MIC BIAS1", "Digital Mic2",
		"TX DMIC3", "MIC BIAS1",
		"MIC BIAS1", "Digital Mic3",
		"TX DMIC4", "MIC BIAS4",
		"MIC BIAS4", "Digital Mic4",
		"TX_AIF1 CAP", "VA_MCLK",
		"TX_AIF2 CAP", "VA_MCLK",
		"RX AIF1 PB", "VA_MCLK",
		"RX AIF2 PB", "VA_MCLK",
		"RX AIF3 PB", "VA_MCLK",
		"RX AIF4 PB", "VA_MCLK",
		"HPHL_OUT", "VA_MCLK",
		"HPHR_OUT", "VA_MCLK",
		"AUX_OUT", "VA_MCLK",
		"IN1_HPHL", "HPHL_OUT",
		"IN2_HPHR", "HPHR_OUT",
		"IN3_AUX", "AUX_OUT",
		"TX SWR_ADC0", "ADC1_OUTPUT",
		"TX SWR_ADC2", "ADC2_OUTPUT",
		"WSA SRC0_INP", "SRC0",
		"WSA_TX DEC0_INP", "TX DEC0 MUX",
		"WSA_TX DEC1_INP", "TX DEC1 MUX",
		"RX_TX DEC0_INP", "TX DEC0 MUX",
		"RX_TX DEC1_INP", "TX DEC1 MUX",
		"RX_TX DEC2_INP", "TX DEC2 MUX",
		"RX_TX DEC3_INP", "TX DEC3 MUX",
		"SpkrLeft IN", "WSA_SPK1 OUT",
		"SpkrRight IN", "WSA_SPK2 OUT",
		"WSA_SPK1 OUT", "VA_MCLK",
		"WSA_SPK2 OUT", "VA_MCLK";
		qcom,msm-mbhc-hphl-swh = <1>;
		qcom,msm-mbhc-gnd-swh = <1>;
		qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;
		qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;
		qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;
		asoc-codec = <&stub_codec>, <&bolero>;
		asoc-codec-names = "msm-stub-codec.1", "bolero_codec";
		qcom,wsa-max-devs = <2>;
		qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0212>,
		<&wsa881x_0213>, <&wsa881x_0214>;
		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
		"SpkrLeft", "SpkrRight";
		qcom,codec-aux-devs = <&wcd938x_codec>;
		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&bolero>;
		};

		&soc {
		cdc_dmic01_gpios: cdc_dmic01_pinctrl {
		compatible = "qcom,msm-cdc-pinctrl";
		@@ -192,6 +249,13 @@
		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;
		};

		cdc_dmic45_gpios: cdc_dmic45_pinctrl {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&cdc_dmic45_clk_active &cdc_dmic45_data_active>;
		pinctrl-1 = <&cdc_dmic45_clk_sleep &cdc_dmic45_data_sleep>;
		};

		wsa_swr_gpios: wsa_swr_clk_data_pinctrl {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";

arch/arm64/boot/dts/qcom/kona-cdp.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@

		#include "kona-pmic-overlay.dtsi"
		#include "kona-camera-sensor-cdp.dtsi"
		#include "kona-audio-overlay.dtsi"

		&qupv3_se12_2uart {
		status = "disabled";

arch/arm64/boot/dts/qcom/kona-mtp.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@

		#include "kona-pmic-overlay.dtsi"
		#include "kona-camera-sensor-mtp.dtsi"
		#include "kona-audio-overlay.dtsi"

		&qupv3_se12_2uart {
		status = "disabled";

arch/arm64/boot/dts/qcom/kona-pinctrl.dtsi

+55 −1

Original line number	Diff line number	Diff line
		@@ -1667,7 +1667,7 @@
		};

		config {
		pins = "gpio27";
		pins = "gpio153";
		drive-strength = <2>;
		pull-down;
		input-enable;
		@@ -1728,6 +1728,60 @@
		};
		};

		cdc_dmic45_clk_active: dmic45_clk_active {
		mux {
		pins = "gpio158";
		function = "func1";
		};

		config {
		pins = "gpio158";
		drive-strength = <8>;
		output-high;
		};
		};

		cdc_dmic45_clk_sleep: dmic45_clk_sleep {
		mux {
		pins = "gpio158";
		function = "func1";
		};

		config {
		pins = "gpio158";
		drive-strength = <2>;
		bias-disable;
		output-low;
		};
		};

		cdc_dmic45_data_active: dmic45_data_active {
		mux {
		pins = "gpio159";
		function = "func1";
		};

		config {
		pins = "gpio159";
		drive-strength = <8>;
		input-enable;
		};
		};

		cdc_dmic45_data_sleep: dmic45_data_sleep {
		mux {
		pins = "gpio159";
		function = "func1";
		};

		config {
		pins = "gpio159";
		drive-strength = <2>;
		pull-down;
		input-enable;
		};
		};

		tx_swr_clk_sleep: tx_swr_clk_sleep {
		mux {
		pins = "gpio146";

arch/arm64/boot/dts/qcom/kona-qrd.dtsi

+42 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		*/

		#include "kona-pmic-overlay.dtsi"
		#include "kona-audio-overlay.dtsi"

		&qupv3_se12_2uart {
		status = "disabled";
		@@ -12,3 +13,44 @@
		&pm8150a_amoled {
		status = "ok";
		};

		&kona_snd {
		qcom,model = "kona-qrd-snd-card";
		qcom,audio-routing =
		"AMIC2", "MIC BIAS2",
		"MIC BIAS2", "Analog Mic2",
		"TX DMIC1", "MIC BIAS3",
		"MIC BIAS3", "Digital Mic1",
		"TX DMIC2", "MIC BIAS1",
		"MIC BIAS1", "Digital Mic2",
		"TX DMIC3", "MIC BIAS1",
		"MIC BIAS1", "Digital Mic3",
		"TX DMIC5", "MIC BIAS4",
		"MIC BIAS4", "Digital Mic5",
		"TX_AIF1 CAP", "VA_MCLK",
		"TX_AIF2 CAP", "VA_MCLK",
		"RX AIF1 PB", "VA_MCLK",
		"RX AIF2 PB", "VA_MCLK",
		"RX AIF3 PB", "VA_MCLK",
		"RX AIF4 PB", "VA_MCLK",
		"HPHL_OUT", "VA_MCLK",
		"HPHR_OUT", "VA_MCLK",
		"AUX_OUT", "VA_MCLK",
		"IN1_HPHL", "HPHL_OUT",
		"IN2_HPHR", "HPHR_OUT",
		"IN3_AUX", "AUX_OUT",
		"TX SWR_ADC0", "ADC1_OUTPUT",
		"TX SWR_ADC2", "ADC2_OUTPUT",
		"WSA SRC0_INP", "SRC0",
		"WSA_TX DEC0_INP", "TX DEC0 MUX",
		"WSA_TX DEC1_INP", "TX DEC1 MUX",
		"RX_TX DEC0_INP", "TX DEC0 MUX",
		"RX_TX DEC1_INP", "TX DEC1 MUX",
		"RX_TX DEC2_INP", "TX DEC2 MUX",
		"RX_TX DEC3_INP", "TX DEC3 MUX",
		"SpkrRight IN", "WSA_SPK2 OUT",
		"WSA_SPK2 OUT", "VA_MCLK";
		qcom,wsa-max-devs = <1>;
		qcom,wsa-devs = <&wsa881x_0212>, <&wsa881x_0214>;
		qcom,wsa-aux-dev-prefix = "SpkrRight", "SpkrRight";
		};