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

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

Merge "ARM: dts: msm: reorder the dtsi for lpi entries on bengal"

parents 510c2e01 40f8767c

qcom/bengal-audio-overlay.dtsi

+0 −49
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#include <dt-bindings/sound/qcom,bolero-clk-rsc.h>

#include <dt-bindings/sound/audio-codec-port-types.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "bengal-lpi.dtsi"



&bolero {

	qcom,num-macros = <3>;
@@ -260,47 +259,6 @@ 
	};

};



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

	};



	rx_swr_gpios: rx_swr_clk_data_pinctrl {

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

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

		pinctrl-0 = <&rx_swr_clk_active &rx_swr_data_active

				&rx_swr_data1_active>;

		pinctrl-1 = <&rx_swr_clk_sleep &rx_swr_data_sleep

				&rx_swr_data1_sleep>;

		qcom,lpi-gpios;

	};



	va_swr_gpios: va_swr_clk_data_pinctrl {

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

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

		pinctrl-0 = <&tx_swr_clk_active &tx_swr_data1_active

			    &tx_swr_data2_active>;

		pinctrl-1 = <&tx_swr_clk_sleep &tx_swr_data1_sleep

			    &tx_swr_data2_sleep>;

		qcom,lpi-gpios;

		qcom,chip-wakeup-reg = <0x003ca04c>;

		qcom,chip-wakeup-maskbit = <0>;

		qcom,chip-wakeup-default-val = <0x1>;

	};

};



&soc {

	wcd937x_rst_gpio: msm_cdc_pinctrl@92 {

		compatible = "qcom,msm-cdc-pinctrl";
@@ -316,13 +274,6 @@ 
		pinctrl-1 = <&spkr_1_sd_n_sleep>;

	};



	wsa881x_analog_clk_gpio: msm_cdc_pinctrl@18 {

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

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

		pinctrl-0 = <&wsa_mclk_active>;

		pinctrl-1 = <&wsa_mclk_sleep>;

	};



	wsa881x_analog_clk: wsa_ana_clk {

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

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

qcom/bengal-audio.dtsi

+67 −13
Original line number Diff line number Diff line
@@ -15,11 +15,66 @@ 
			qcom,codec-ext-clk-src = <AUDIO_LPASS_AUDIO_HW_VOTE>;

			#clock-cells = <1>;

		};

	};

};



#include "bengal-lpi.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;

	};



	rx_swr_gpios: rx_swr_clk_data_pinctrl {

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

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

		pinctrl-0 = <&rx_swr_clk_active &rx_swr_data_active

				&rx_swr_data1_active>;

		pinctrl-1 = <&rx_swr_clk_sleep &rx_swr_data_sleep

				&rx_swr_data1_sleep>;

		qcom,lpi-gpios;

	};



	va_swr_gpios: va_swr_clk_data_pinctrl {

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

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

		pinctrl-0 = <&tx_swr_clk_active &tx_swr_data1_active

			    &tx_swr_data2_active>;

		pinctrl-1 = <&tx_swr_clk_sleep &tx_swr_data1_sleep

			    &tx_swr_data2_sleep>;

		qcom,lpi-gpios;

		qcom,chip-wakeup-reg = <0x003ca04c>;

		qcom,chip-wakeup-maskbit = <0>;

		qcom,chip-wakeup-default-val = <0x1>;

	};



	wsa881x_analog_clk_gpio: msm_cdc_pinctrl@18 {

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

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

		pinctrl-0 = <&wsa_mclk_active>;

		pinctrl-1 = <&wsa_mclk_sleep>;

		qcom,lpi-gpios;

	};

};



&q6core {

	bolero: bolero-cdc {

		compatible = "qcom,bolero-codec";

		clock-names = "lpass_audio_hw_vote";

		clocks = <&lpass_audio_hw_vote 0>;



		bolero-clk-rsc-mngr {

			compatible = "qcom,bolero-clk-rsc-mngr";

		};
@@ -35,7 +90,6 @@ 
		};

	};

};

};



&q6core {

	bengal_snd: sound {

qcom/scuba-audio-overlay.dtsi

+0 −50
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#include <dt-bindings/sound/qcom,bolero-clk-rsc.h>

#include <dt-bindings/sound/audio-codec-port-types.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "scuba-lpi.dtsi"



&bolero {

	qcom,num-macros = <3>;
@@ -249,55 +248,6 @@ 
	};

};



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

	};



	rx_swr_gpios: rx_swr_clk_data_pinctrl {

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

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

		pinctrl-0 = <&rx_swr_clk_active &rx_swr_data_active

				&rx_swr_data1_active>;

		pinctrl-1 = <&rx_swr_clk_sleep &rx_swr_data_sleep

				&rx_swr_data1_sleep>;

		qcom,lpi-gpios;

	};



	va_swr_gpios: va_swr_clk_data_pinctrl {

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

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

		pinctrl-0 = <&tx_swr_clk_active &tx_swr_data1_active

			    &tx_swr_data2_active>;

		pinctrl-1 = <&tx_swr_clk_sleep &tx_swr_data1_sleep

			    &tx_swr_data2_sleep>;

		qcom,lpi-gpios;

		qcom,chip-wakeup-reg = <0x003ca064>;

		qcom,chip-wakeup-maskbit = <0>;

		qcom,chip-wakeup-default-val = <0x1>;

	};



	wsa881x_analog_clk_gpio: msm_cdc_pinctrl@18 {

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

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

		pinctrl-0 = <&wsa_mclk_active>;

		pinctrl-1 = <&wsa_mclk_sleep>;

		qcom,lpi-gpios;

	};

};



&soc {

	wsa881x_analog_reset_gpio: msm_cdc_pinctrl@106 {

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

qcom/scuba-audio.dtsi

+67 −13
Original line number Diff line number Diff line
@@ -16,6 +16,61 @@ 
			#clock-cells = <1>;

		};



	};

};



#include "scuba-lpi.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;

	};



	rx_swr_gpios: rx_swr_clk_data_pinctrl {

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

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

		pinctrl-0 = <&rx_swr_clk_active &rx_swr_data_active

				&rx_swr_data1_active>;

		pinctrl-1 = <&rx_swr_clk_sleep &rx_swr_data_sleep

				&rx_swr_data1_sleep>;

		qcom,lpi-gpios;

	};



	va_swr_gpios: va_swr_clk_data_pinctrl {

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

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

		pinctrl-0 = <&tx_swr_clk_active &tx_swr_data1_active

			    &tx_swr_data2_active>;

		pinctrl-1 = <&tx_swr_clk_sleep &tx_swr_data1_sleep

			    &tx_swr_data2_sleep>;

		qcom,lpi-gpios;

		qcom,chip-wakeup-reg = <0x003ca064>;

		qcom,chip-wakeup-maskbit = <0>;

		qcom,chip-wakeup-default-val = <0x1>;

	};



	wsa881x_analog_clk_gpio: msm_cdc_pinctrl@18 {

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

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

		pinctrl-0 = <&wsa_mclk_active>;

		pinctrl-1 = <&wsa_mclk_sleep>;

		qcom,lpi-gpios;

	};

};



&q6core {

	bolero: bolero-cdc {

		compatible = "qcom,bolero-codec";

		clock-names = "lpass_audio_hw_vote";
@@ -35,7 +90,6 @@ 
		};

	};

};

};



&q6core {

	scuba_snd: sound {