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

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

Merge "ARM: dts: msm: updates for voting LPASS NPA resource"

parents 796999d8 ebb81a94

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

+8 −0
Original line number Diff line number Diff line
@@ -13,6 +13,14 @@ 


#include "qcs405-tasha.dtsi"



&q6core {

	bolero: bolero-cdc {

		compatible = "qcom,bolero-codec";

		clock-names = "island_lpass_npa_rsc";

		clocks = <&lpass_npa_rsc_island 0>;

	};

};



&qcs405_snd {

	qcom,model = "qcs405-amic-snd-card";

	qcom,tasha-codec = <1>;

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

+44 −39
Original line number Diff line number Diff line
@@ -11,8 +11,48 @@ 
 * GNU General Public License for more details.

 */



#include "qcs405-tasha.dtsi"

#include "qcs405-va-bolero.dtsi"

&q6core {

	cdc_dmic01_gpios: cdc_dmic01_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>;

		pinctrl-1 = <&cdc_dmic01_clk_sleep &cdc_dmic01_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic23_gpios: cdc_dmic23_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>;

		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic45_gpios: cdc_dmic45_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic45_clk_active &cdc_dmic45_data_active>;

		pinctrl-1 = <&cdc_dmic45_clk_sleep &cdc_dmic45_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic67_gpios: cdc_dmic67_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic67_clk_active &cdc_dmic67_data_active>;

		pinctrl-1 = <&cdc_dmic67_clk_sleep &cdc_dmic67_data_sleep>;

		qcom,lpi-gpios;

	};

};



&q6core {

	bolero: bolero-cdc {

		compatible = "qcom,bolero-codec";

		clock-names = "island_lpass_npa_rsc";

		clocks = <&lpass_npa_rsc_island 0>;

		qcom,num-macros = <1>;

	};

};



&qcs405_snd {

	qcom,model = "qcs405-snd-card";
@@ -53,40 +93,5 @@ 
		&sec_mi2s_sd2_active &sec_mi2s_sd3_active>;

};



&bolero {

	qcom,num-macros = <1>;

};



&soc {

	cdc_dmic01_gpios: cdc_dmic01_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>;

		pinctrl-1 = <&cdc_dmic01_clk_sleep &cdc_dmic01_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic23_gpios: cdc_dmic23_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>;

		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic45_gpios: cdc_dmic45_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic45_clk_active &cdc_dmic45_data_active>;

		pinctrl-1 = <&cdc_dmic45_clk_sleep &cdc_dmic45_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic67_gpios: cdc_dmic67_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic67_clk_active &cdc_dmic67_data_active>;

		pinctrl-1 = <&cdc_dmic67_clk_sleep &cdc_dmic67_data_sleep>;

		qcom,lpi-gpios;

	};

};
 
#include "qcs405-tasha.dtsi"

#include "qcs405-va-bolero.dtsi"

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

+11 −4
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 */



#include <dt-bindings/clock/qcom,audio-ext-clk.h>

#include "qcs405-lpi.dtsi"



#include "msm-audio-lpass.dtsi"



&msm_audio_ion {
@@ -33,12 +33,19 @@ 
		compatible = "qcom,msm-audio-apr";

		q6core: q6core {

			compatible = "qcom,q6core-audio";

			bolero: bolero-cdc {

				compatible = "qcom,bolero-codec";

		};

	};

};



&q6core {

	lpass_npa_rsc_island: island_lpass_npa_rsc  {

		compatible = "qcom,audio-ref-clk";

		qcom,codec-ext-clk-src = <9>;

		#clock-cells = <1>;

	};

};



#include "qcs405-lpi.dtsi"



&i2c_3 {

	status = "okay";

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

+45 −38
Original line number Diff line number Diff line
@@ -11,9 +11,48 @@ 
 * GNU General Public License for more details.

 */



#include "qcs405-tasha.dtsi"

#include "qcs405-va-bolero.dtsi"

#include "qcs405-csra1.dtsi"

&q6core {

	cdc_dmic01_gpios: cdc_dmic01_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>;

		pinctrl-1 = <&cdc_dmic01_clk_sleep &cdc_dmic01_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic23_gpios: cdc_dmic23_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>;

		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic45_gpios: cdc_dmic45_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic45_clk_active &cdc_dmic45_data_active>;

		pinctrl-1 = <&cdc_dmic45_clk_sleep &cdc_dmic45_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic67_gpios: cdc_dmic67_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic67_clk_active &cdc_dmic67_data_active>;

		pinctrl-1 = <&cdc_dmic67_clk_sleep &cdc_dmic67_data_sleep>;

		qcom,lpi-gpios;

	};

};



&q6core {

	bolero: bolero-cdc {

		compatible = "qcom,bolero-codec";

		clock-names = "island_lpass_npa_rsc";

		clocks = <&lpass_npa_rsc_island 0>;

		qcom,num-macros = <1>;

	};

};



&qcs405_snd {

	qcom,model = "qcs405-csra1-snd-card";
@@ -61,44 +100,12 @@ 
		&sec_mi2s_sd2_active &sec_mi2s_sd3_active>;

};



&bolero {

	qcom,num-macros = <1>;

};



&dai_mi2s0 {

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

};



&soc {

	cdc_dmic01_gpios: cdc_dmic01_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>;

		pinctrl-1 = <&cdc_dmic01_clk_sleep &cdc_dmic01_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic23_gpios: cdc_dmic23_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>;

		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;

		qcom,lpi-gpios;

	};

#include "qcs405-tasha.dtsi"

#include "qcs405-va-bolero.dtsi"

#include "qcs405-csra1.dtsi"



	cdc_dmic45_gpios: cdc_dmic45_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic45_clk_active &cdc_dmic45_data_active>;

		pinctrl-1 = <&cdc_dmic45_clk_sleep &cdc_dmic45_data_sleep>;

		qcom,lpi-gpios;

	};

	cdc_dmic67_gpios: cdc_dmic67_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic67_clk_active &cdc_dmic67_data_active>;

		pinctrl-1 = <&cdc_dmic67_clk_sleep &cdc_dmic67_data_sleep>;

		qcom,lpi-gpios;

	};

};

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

+45 −39
Original line number Diff line number Diff line
@@ -11,9 +11,48 @@ 
 * GNU General Public License for more details.

 */



#include "qcs405-tasha.dtsi"

#include "qcs405-va-bolero.dtsi"

#include "qcs405-csra6.dtsi"

&q6core {

	cdc_dmic01_gpios: cdc_dmic01_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>;

		pinctrl-1 = <&cdc_dmic01_clk_sleep &cdc_dmic01_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic23_gpios: cdc_dmic23_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>;

		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic45_gpios: cdc_dmic45_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic45_clk_active &cdc_dmic45_data_active>;

		pinctrl-1 = <&cdc_dmic45_clk_sleep &cdc_dmic45_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic67_gpios: cdc_dmic67_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic67_clk_active &cdc_dmic67_data_active>;

		pinctrl-1 = <&cdc_dmic67_clk_sleep &cdc_dmic67_data_sleep>;

		qcom,lpi-gpios;

	};

};



&q6core {

	bolero: bolero-cdc {

		compatible = "qcom,bolero-codec";

		clock-names = "island_lpass_npa_rsc";

		clocks = <&lpass_npa_rsc_island 0>;

		qcom,num-macros = <1>;

	};

};



&qcs405_snd {

	qcom,model = "qcs405-csra6-snd-card";
@@ -71,44 +110,11 @@ 
		&sec_mi2s_sd2_active &sec_mi2s_sd3_active>;

};



&bolero {

	qcom,num-macros = <1>;

};



&dai_mi2s0 {

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

};



&soc {

	cdc_dmic01_gpios: cdc_dmic01_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>;

		pinctrl-1 = <&cdc_dmic01_clk_sleep &cdc_dmic01_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic23_gpios: cdc_dmic23_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>;

		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic45_gpios: cdc_dmic45_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic45_clk_active &cdc_dmic45_data_active>;

		pinctrl-1 = <&cdc_dmic45_clk_sleep &cdc_dmic45_data_sleep>;

		qcom,lpi-gpios;

	};

#include "qcs405-tasha.dtsi"

#include "qcs405-va-bolero.dtsi"

#include "qcs405-csra6.dtsi"

	cdc_dmic67_gpios: cdc_dmic67_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic67_clk_active &cdc_dmic67_data_active>;

		pinctrl-1 = <&cdc_dmic67_clk_sleep &cdc_dmic67_data_sleep>;

		qcom,lpi-gpios;

	};

};