Merge "ARM: dts: msm: dtsi changes for holi" (0e0a1e2c) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/holi-audio-overlay.dtsi

+6 −4

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		#include <dt-bindings/sound/qcom,bolero-clk-rsc.h>
		#include <dt-bindings/sound/audio-codec-port-types.h>
		#include <dt-bindings/interrupt-controller/arm-gic.h>
		#include <dt-bindings/gpio/gpio.h>

		&bolero {
		qcom,num-macros = <3>;
		@@ -13,7 +14,7 @@
		qcom,fs-gen-sequence = <0x3000 0x1>,
		<0x3004 0x1>, <0x3080 0x2>;
		qcom,rx_mclk_mode_muxsel = <0x0A5640D8>;
		qcom,va_mclk_mode_muxsel = <0x0A730000>;
		qcom,va_mclk_mode_muxsel = <0x0A7A0000>;
		clock-names = "tx_core_clk", "tx_npl_clk", "rx_core_clk", "rx_npl_clk",
		"va_core_clk", "va_npl_clk";
		clocks = <&clock_audio_tx_1 0>, <&clock_audio_tx_2 0>,
		@@ -42,7 +43,7 @@
		swrm-io-base = <0xA740000 0x0>;
		interrupts-extended =
		<&wakegic 5 IRQ_TYPE_LEVEL_HIGH>,
		<&wakegic 66 IRQ_TYPE_LEVEL_HIGH>;
		<&tlmm 128 GPIO_ACTIVE_HIGH>;
		interrupt-names = "swr_master_irq", "swr_wake_irq";
		qcom,swr-num-ports = <3>;
		qcom,swr-port-mapping = <1 SWRM_TX1_CH1 0x1>,
		@@ -89,7 +90,7 @@
		qcom,rx_mclk_mode_muxsel = <0xA5640D8>;
		qcom,rx-bcl-pmic-params = /bits/ 8 <0x00 0x03 0x48>;
		qcom,default-clk-id = <TX_CORE_CLK>;
		swri: rx_swr_master {
		swr1: rx_swr_master {
		compatible = "qcom,swr-mstr";
		#address-cells = <2>;
		#size-cells = <0>;
		@@ -230,7 +231,7 @@
		&holi_snd {
		qcom,model = "holi-mtp-snd-card";
		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>;
		qcom,wcn-btfm = <0>;
		qcom,wcn-btfm = <1>;
		qcom,tdm-max-slots = <4>;
		qcom,audio-routing =
		"AMIC1", "Analog Mic1",
		@@ -346,6 +347,7 @@
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&spkr_2_sd_n_active>;
		pinctrl-1 = <&spkr_2_sd_n_sleep>;
		#gpio-cells = <0>;
		};

		wsa881x_analog_clk: wsa_ana_clk {

qcom/holi-audio.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@
		compatible = "qcom,lpi-pinctrl";
		reg = <0xa7c0000 0x0>;
		qcom,slew-reg = <0x0a95a000 0x0>;
		clock-names = "lpass_audio_hw_vote";
		clocks = <&lpass_audio_hw_vote 0>;
		qcom,gpios-count = <19>;
		gpio-controller;
		#gpio-cells = <2>;

qcom/holi-cdp-overlay.dts

+0 −16

Original line number	Diff line number	Diff line
		@@ -10,22 +10,6 @@
		qcom,board-id = <1 0>;
		};

		&wsa881x_i2c_e {
		status = "disabled";
		};

		&wsa881x_i2c_44 {
		status = "disabled";
		};

		&wsa881x_i2c_f {
		status = "ok";
		};

		&wsa881x_i2c_45 {
		status = "ok";
		};

		&wsa881x_analog_reset_gpio {
		pinctrl-0 = <&spkr_1_sd_n_active>;
		pinctrl-1 = <&spkr_1_sd_n_sleep>;

qcom/holi-qrd.dtsi

+43 −78

Original line number	Diff line number	Diff line
		@@ -145,96 +145,61 @@

		&holi_snd {
		qcom,model = "holi-qrd-snd-card";
		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>;
		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>;
		qcom,wcn-btfm = <1>;
		qcom,audio-routing =
		"AMIC1", "MIC BIAS1",
		"MIC BIAS1", "Analog Mic1",
		"AMIC2", "MIC BIAS2",
		"MIC BIAS2", "Analog Mic2",
		"AMIC3", "MIC BIAS3",
		"MIC BIAS3", "Analog Mic3",
		"AMIC4", "MIC BIAS1",
		"MIC BIAS1", "Analog Mic4",
		"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 DMIC5", "MIC BIAS4",
		"MIC BIAS4", "Digital Mic5",
		"AMIC1", "Analog Mic1",
		"Analog Mic1", "MIC BIAS1",
		"AMIC2", "Analog Mic2",
		"Analog Mic2", "MIC BIAS2",
		"AMIC3", "Analog Mic3",
		"Analog Mic3", "MIC BIAS3",
		"AMIC4", "Analog Mic4",
		"Analog Mic4", "MIC BIAS3",
		"TX DMIC0", "Digital Mic0",
		"TX DMIC0", "MIC BIAS1",
		"TX DMIC1", "Digital Mic1",
		"TX DMIC1", "MIC BIAS1",
		"TX DMIC2", "Digital Mic2",
		"TX DMIC2", "MIC BIAS3",
		"TX DMIC3", "Digital Mic3",
		"TX DMIC3", "MIC BIAS3",
		"IN1_HPHL", "HPHL_OUT",
		"IN2_HPHR", "HPHR_OUT",
		"IN3_AUX", "AUX_OUT",
		"TX SWR_ADC0", "ADC1_OUTPUT",
		"TX SWR_ADC2", "ADC2_OUTPUT",
		"TX SWR_ADC3", "ADC3_OUTPUT",
		"TX SWR_DMIC0", "DMIC1_OUTPUT",
		"TX SWR_DMIC1", "DMIC2_OUTPUT",
		"TX SWR_DMIC2", "DMIC3_OUTPUT",
		"TX SWR_DMIC3", "DMIC4_OUTPUT",
		"TX SWR_DMIC4", "DMIC5_OUTPUT",
		"TX SWR_DMIC5", "DMIC6_OUTPUT",
		"TX SWR_DMIC6", "DMIC7_OUTPUT",
		"TX SWR_DMIC7", "DMIC8_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",
		"SpkrMono WSA_IN", "AUX",
		"TX SWR_INPUT", "WCD_TX_OUTPUT",
		"VA SWR_INPUT", "VA_SWR_CLK",
		"VA SWR_INPUT", "WCD_TX_OUTPUT",
		"VA_AIF1 CAP", "VA_SWR_CLK",
		"VA_AIF2 CAP", "VA_SWR_CLK",
		"VA_AIF3 CAP", "VA_SWR_CLK",
		"VA MIC BIAS3", "Digital Mic0",
		"VA MIC BIAS3", "Digital Mic1",
		"VA MIC BIAS1", "Digital Mic2",
		"VA MIC BIAS1", "Digital Mic3",
		"VA MIC BIAS4", "Digital Mic4",
		"VA MIC BIAS4", "Digital Mic5",
		"VA DMIC0", "VA MIC BIAS3",
		"VA DMIC1", "VA MIC BIAS3",
		"VA DMIC2", "VA MIC BIAS1",
		"VA DMIC3", "VA MIC BIAS1",
		"VA DMIC4", "VA MIC BIAS4",
		"VA DMIC5", "VA MIC BIAS4",
		"VA SWR_ADC0", "VA_SWR_CLK",
		"VA SWR_ADC1", "VA_SWR_CLK",
		"VA SWR_ADC2", "VA_SWR_CLK",
		"VA SWR_ADC3", "VA_SWR_CLK",
		"VA SWR_MIC0", "VA_SWR_CLK",
		"VA SWR_MIC1", "VA_SWR_CLK",
		"VA SWR_MIC2", "VA_SWR_CLK",
		"VA SWR_MIC3", "VA_SWR_CLK",
		"VA SWR_MIC4", "VA_SWR_CLK",
		"VA SWR_MIC5", "VA_SWR_CLK",
		"VA SWR_MIC6", "VA_SWR_CLK",
		"VA SWR_MIC7", "VA_SWR_CLK",
		"VA SWR_ADC0", "ADC1_OUTPUT",
		"VA SWR_ADC2", "ADC2_OUTPUT",
		"VA SWR_ADC3", "ADC3_OUTPUT",
		"VA SWR_MIC0", "DMIC1_OUTPUT",
		"VA SWR_MIC1", "DMIC2_OUTPUT",
		"VA SWR_MIC2", "DMIC3_OUTPUT",
		"VA SWR_MIC3", "DMIC4_OUTPUT",
		"VA SWR_MIC4", "DMIC5_OUTPUT",
		"VA SWR_MIC5", "DMIC6_OUTPUT",
		"VA SWR_MIC6", "DMIC7_OUTPUT",
		"VA SWR_MIC7", "DMIC8_OUTPUT";
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,wsa-devs = <&wsa881x_i2c_e>;
		qcom,wsa-aux-dev-prefix = "SpkrLeft";
		qcom,codec-aux-devs = <&wcd937x_codec>;
		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>,
		<&lpi_tlmm>, <&bolero>;
		"VA DMIC0", "Digital Mic0",
		"VA DMIC1", "Digital Mic1",
		"VA DMIC2", "Digital Mic2",
		"VA DMIC3", "Digital Mic3",
		"VA DMIC4", "Digital Mic4",
		"VA DMIC5", "Digital Mic5",
		"VA DMIC0", "VA MIC BIAS1",
		"VA DMIC1", "VA MIC BIAS1",
		"VA DMIC2", "VA MIC BIAS3",
		"VA DMIC3", "VA MIC BIAS3";
		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>;
		asoc-codec = <&stub_codec>, <&bolero>,
		<&wcd937x_codec>, <&wsa881x_i2c_e>,
		<&wsa881x_i2c_f>;
		asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
		"wcd937x_codec", "wsa-codec0",
		"wsa-codec1";
		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,
		<&bolero>;
		};

		&soc {

qcom/holi.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -420,6 +420,7 @@
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0 0 0 0xffffffff>;
		#gpio-cells = <2>;
		compatible = "simple-bus";

		psci {
		@@ -473,6 +474,7 @@
		reg = <0xf200000 0x10000>, /* GICD */
		<0xf240000 0x100000>; /* GICR * 8 */
		interrupts = <GIC_PPI 8 IRQ_TYPE_LEVEL_HIGH>;
		#gpio-cells = <0>;
		};

		spmi_bus: qcom,spmi@1c40000 {