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

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

Merge "ARM: dts: msm: Change I2C clk to 100kHz for CSRA"

parents cc869a5a 117a69bc

arch/arm64/boot/dts/qcom/qcs405-audio.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
		qcom,auxpcm-audio-intf = <1>;

		qcom,spdif-audio-intf = <1>;

		qcom,wcn-btfm = <1>;

		qcom,msm-mi2s-master = <1>, <0>, <1>, <1>, <1>;

		qcom,msm-mi2s-master = <1>, <0>, <1>, <1>, <1>, <1>;



		qcom,ep92-name = "ep92.3-0064";

		qcom,ep92-busnum  = <3>;

arch/arm64/boot/dts/qcom/qcs405-csra1-audio-overlay.dtsi

+5 −3
Original line number Diff line number Diff line
@@ -55,9 +55,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&spdifrx_opt_default

		&pri_mi2s_sck_active &pri_mi2s_ws_active

		&pri_mi2s_sd0_active &pri_mi2s_sd1_active

		&pri_mi2s_sd2_active &pri_mi2s_sd3_active

		&pri_mi2s_sd4_active &pri_mi2s_sd5_active

		&pri_mi2s_sd0_active

		&sec_mi2s_sck_active &sec_mi2s_ws_active

		&sec_mi2s_sd0_active &sec_mi2s_sd1_active

		&sec_mi2s_sd2_active &sec_mi2s_sd3_active>;
@@ -67,6 +65,10 @@ 
	qcom,num-macros = <1>;

};



&dai_mi2s0 {

	qcom,msm-mi2s-rx-lines = <0x1>;

};



&soc {

	cdc_dmic01_gpios: cdc_dmic01_pinctrl {

		compatible = "qcom,msm-cdc-pinctrl";

arch/arm64/boot/dts/qcom/qcs405-csra1.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



&i2c_5 {

	qcom,clk-freq-out = <100000>;

	status = "okay";

	/* CSRA66X0 cluster GRP_0 */

	csra66x0_ampl_68: csra66x0@68 {

arch/arm64/boot/dts/qcom/qcs405-csra6-audio-overlay.dtsi

+9 −5
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ 
	asoc-codec = <&stub_codec>, <&bolero>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec";

	qcom,csra-max-devs = <6>;

	qcom,csra-devs = <&csra66x0_ampl_68>, <&csra66x0_ampl_69>,

		<&csra66x0_ampl_6A>, <&csra66x0_ampl_6B>,

		<&csra66x0_ampl_68_1>, <&csra66x0_ampl_69_1>;

	qcom,csra-aux-dev-prefix = "CSRA_12", "CSRA_34", "CSRA_56",

					"CSRA_78", "CSRA_9A", "CSRA_BC";

	qcom,csra-devs = <&csra66x0_ampl_6B>, <&csra66x0_ampl_6A>,

		<&csra66x0_ampl_69>, <&csra66x0_ampl_68>,

		<&csra66x0_ampl_69_1>, <&csra66x0_ampl_68_1>;

	qcom,csra-aux-dev-prefix = "CSRA_78", "CSRA_56", "CSRA_34",

		"CSRA_12", "CSRA_BC", "CSRA_9A";

	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;

	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;

	qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;
@@ -75,6 +75,10 @@ 
	qcom,num-macros = <1>;

};



&dai_mi2s0 {

	qcom,msm-mi2s-rx-lines = <0x3f>;

};



&soc {

	cdc_dmic01_gpios: cdc_dmic01_pinctrl {

		compatible = "qcom,msm-cdc-pinctrl";

arch/arm64/boot/dts/qcom/qcs405-csra6.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



&i2c_5 {

	qcom,clk-freq-out = <100000>;

	status = "okay";

	/* CSRA66X0 cluster GRP_0 */

	csra66x0_ampl_68: csra66x0@68 {