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

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

Merge "ARM: dts: msm: correction to adsp variant read entry"

parents 5ad4f3bf 4e63ed8e

qcom/holi-atp-overlay.dts

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

	qcom,board-id = <33 0>;

};



&wsa881x_i2c_e {

	status = "disabled";

};



&wsa881x_i2c_44 {

	status = "disabled";

};



&wcd937x_tx_slave {

	status = "disabled";

};



&wcd937x_rx_slave {

	status = "disabled";

};



&wcd937x_codec {

	status = "disabled";

};



&holi_snd {

	qcom,wcd-disabled = <1>;

	qcom,audio-routing =

		"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",

		"VA SWR_INPUT", "VA_SWR_CLK",

		"VA_AIF1 CAP", "VA_SWR_CLK",

		"VA_AIF2 CAP", "VA_SWR_CLK",

		"VA_AIF3 CAP", "VA_SWR_CLK",

		"VA DMIC0", "Digital Mic0",

		"VA DMIC1", "Digital Mic1",

		"VA DMIC2", "Digital Mic2",

		"VA DMIC3", "Digital Mic3",

		"VA DMIC4", "Digital Mic4",

		"VA DMIC5", "Digital Mic5";

};

qcom/holi-atp.dtsi

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

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/linux-event-codes.h>

#include "holi-pmic-overlay.dtsi"

qcom/holi.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -2705,7 +2705,7 @@ 


		adsp_variant: adsp_variant@1E6 {

			reg = <0x1E6 0x2>;

			bits = <6 9>;

			bits = <6 4>;

		};



		feat_conf8: feat_conf8@6024 {