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

Commit dbc961c3 authored by Dieter Luecking's avatar Dieter Luecking Committed by Mangesh Kunchamwar
Browse files

ARM: dts: msm: Update to CSRA device node for QCS405 



Change sequence in qcom,csra-devs and
qcom,csra-aux-dev-prefix to support correct
master/slave device probe sequence on bootup.
Adding dai_mi2s0 node config to allow different
SD line usage depending on CSRA configuration.

Change-Id: I83fafeba9ab549c99c588c48f31381f008d3f0a7
Signed-off-by: default avatarDieter Luecking <dieterl@codeaurora.org>
parent b484d42f

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