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

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

Merge "ARM: dts: qcom: use spkr_1 for holi QRD"

parents ae670fa0 ab467ca0

qcom/holi-audio-overlay.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
			qcom,mipi-sdw-block-packing-mode = <1>;

			swrm-io-base = <0xA740000 0x0>;

			interrupts-extended =

				<&intc GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH>,

				<&intc GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;

				<&wakegic 5 IRQ_TYPE_LEVEL_HIGH>,

				<&wakegic 66 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "swr_master_irq", "swr_wake_irq";

			qcom,swr-num-ports = <3>;

			qcom,swr-port-mapping = <1 SWRM_TX1_CH1 0x1>,
@@ -214,7 +214,7 @@ 


		cdc-vdd-mic-bias-supply = <&BOB>;

		qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>;

		qcom,cdc-vdd-mic-bias-current = <i45000>;

		qcom,cdc-vdd-mic-bias-current = <45000>;



		qcom,cdc-micbias1-mv = <1800>;

		qcom,cdc-micbias2-mv = <1800>;
@@ -272,7 +272,7 @@ 
		"VA DMIC0", "VA MIC BIAS1",

		"VA DMIC1", "VA MIC BIAS1",

		"VA DMIC2", "VA MIC BIAS3",

		"VA DMIC3", "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/holi-cdp-overlay.dts

+5 −0
Original line number Diff line number Diff line
@@ -9,3 +9,8 @@ 
	qcom,msm-id = <454 0x10000>;

	qcom,board-id = <1 0>;

};



&wsa881x_analog_reset_gpio {

	pinctrl-0 = <&spkr_1_sd_n_active>;

	pinctrl-1 = <&spkr_1_sd_n_sleep>;

};

qcom/holi-cdp.dtsi

+1 −0
Original line number Diff line number Diff line 
#include "holi-audio-overlay.dtsi"



&ufsphy_mem {

		compatible = "qcom,ufs-phy-qmp-v3";

qcom/holi-mtp-usbc.dtsi

+7 −0
Original line number Diff line number Diff line 
#include "holi-audio-overlay.dtsi"



&ufsphy_mem {

		compatible = "qcom,ufs-phy-qmp-v3";
@@ -29,3 +30,9 @@ 


		status = "ok";

};



&holi_snd {

	qcom,msm-mbhc-usbc-audio-supported = <1>;

	qcom,msm-mbhc-hphl-swh = <0>;

	qcom,msm-mbhc-gnd-swh = <0>;

};

qcom/holi-mtp.dtsi

+1 −0
Original line number Diff line number Diff line 
#include "holi-audio-overlay.dtsi"



&ufsphy_mem {

		compatible = "qcom,ufs-phy-qmp-v3";