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

Commit 07cf6ecb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: sdm429w enable adsp power"

parents eae6bb80 6c391e9c

arch/arm64/boot/dts/qcom/sdm429-qrd-spyro-evt.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,5 +20,5 @@ 
	model = "Qualcomm Technologies, Inc. SDM429 QRD Spyro";

	model = "Qualcomm Technologies, Inc. SDM429 QRD Spyro";

	compatible = "qcom,sdm429-qrd", "qcom,sdm429", "qcom,qrd";

	compatible = "qcom,sdm429-qrd", "qcom,sdm429", "qcom,qrd";

	qcom,board-id = <0xb 6>;

	qcom,board-id = <0xb 6>;

	qcom,pmic-id = <0x010016 0x25 0x0 0x0>;

	qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;

};
 
};

arch/arm64/boot/dts/qcom/sdm429-qrd-spyro-evt.dtsi

+55 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,32 @@ 
#include "sdm429w-pm660.dtsi"

#include "sdm429w-pm660.dtsi"

#include "sdm429w-camera-sensor-spyro.dtsi"

#include "sdm429w-camera-sensor-spyro.dtsi"





&gpio_key_active {

	mux {

		pins = "gpio91", "gpio127", "gpio128", "gpio35", "gpio126";

		function = "gpio";

	};



	config {

		pins = "gpio91", "gpio127", "gpio128", "gpio35", "gpio126";

		drive-strength = <2>;

		bias-pull-up;

	};

};



&gpio_key_suspend {

	mux {

		pins = "gpio91", "gpio127", "gpio128", "gpio35", "gpio126";

		function = "gpio";

	};



	config {

		pins = "gpio91", "gpio127", "gpio128", "gpio35", "gpio126";

		drive-strength = <2>;

		bias-pull-up;

	};

};



&cdc_pdm_lines_act {

&cdc_pdm_lines_act {

	mux {

	mux {

		pins = "gpio68", "gpio73", "gpio74";

		pins = "gpio68", "gpio73", "gpio74";
@@ -44,6 +70,35 @@ 
	qcom,dsi-pref-prim-pan = <&dsi_hx8399c_hd_vid>;

	qcom,dsi-pref-prim-pan = <&dsi_hx8399c_hd_vid>;

};

};





&i2c_5 {

	status = "disabled";

};



&vol_up {

	gpios = <&tlmm 35 0x1>;

};



&gpio_keys {

	function_1: function_1 {

		label = "function_1";

		gpios = <&tlmm 127 0x1>;

		linux,input-type = <1>;

		linux,code = <116>;

		debounce-interval = <15>;

		linux,can-disable;

		gpio-key,wakeup;

	};



	function_2: function_2 {

		label = "function_2";

		gpios = <&tlmm 126 0x1>;

		linux,input-type = <1>;

		linux,code = <117>;

		debounce-interval = <15>;

		linux,can-disable;

		gpio-key,wakeup;

	};

};





&soc {

&soc {

	/delete-node/ qcom,spm@b1d2000;

	/delete-node/ qcom,spm@b1d2000;

arch/arm64/boot/dts/qcom/sdm429w-pm660.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -177,7 +177,7 @@ 
	};

	};





	qcom,lpass@c200000 {

	qcom,lpass@c200000 {

		/delete-property/ vdd_cx-supply;

		vdd_cx-supply = <&pm660_s2_level>;

	};

	};





	qcom,pronto@a21b000 {

	qcom,pronto@a21b000 {

arch/arm64/boot/dts/qcom/sdm439-qrd.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -130,13 +130,13 @@ 
};

};





&soc {

&soc {

	gpio_keys {

	gpio_keys: gpio_keys {

		compatible = "gpio-keys";

		compatible = "gpio-keys";

		label = "gpio-keys";

		label = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&gpio_key_active>;

		pinctrl-0 = <&gpio_key_active>;





		vol_up {

		vol_up: vol_up {

			label = "volume_up";

			label = "volume_up";

			gpios = <&tlmm 91 0x1>;

			gpios = <&tlmm 91 0x1>;

			linux,input-type = <1>;

			linux,input-type = <1>;