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

Commit 08be99e8 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: Optimize the gpio status at RBSC"

parents e56c1c5c ee17579a
Loading
Loading
Loading
Loading
+40 −6
Original line number Original line Diff line number Diff line
@@ -15,14 +15,46 @@
#include "sdm429-spyro-qrd-evt-camera.dtsi"
#include "sdm429-spyro-qrd-evt-camera.dtsi"
#include "sdm429-spyro-qrd-evt-audio.dtsi"
#include "sdm429-spyro-qrd-evt-audio.dtsi"


&tlmm {
	sd_eldo_active {
		sd_eldo_active: sd_eldo_active {
			mux {
				pins = "gpio91";
				function = "gpio";
			};

			config {
				pins = "gpio91";
				drive-strength = <2>;
				bias-pull-up;
			};
		};
	};

	sd_eldo_suspend {
		sd_eldo_suspend: sd_eldo_suspend {
			mux {
				pins = "gpio91";
				function = "gpio";
			};

			config {
				pins = "gpio91";
				drive-strength = <2>;
				bias-disable;
			};
		};
	};
};

&gpio_key_active {
&gpio_key_active {
	mux {
	mux {
		pins = "gpio91", "gpio127", "gpio128", "gpio35", "gpio126";
		pins = "gpio127", "gpio128", "gpio35", "gpio126";
		function = "gpio";
		function = "gpio";
	};
	};


	config {
	config {
		pins = "gpio91", "gpio127", "gpio128", "gpio35", "gpio126";
		pins = "gpio127", "gpio128", "gpio35", "gpio126";
		drive-strength = <2>;
		drive-strength = <2>;
		bias-pull-up;
		bias-pull-up;
	};
	};
@@ -30,12 +62,12 @@


&gpio_key_suspend {
&gpio_key_suspend {
	mux {
	mux {
		pins = "gpio91", "gpio127", "gpio128", "gpio35", "gpio126";
		pins = "gpio127", "gpio128", "gpio35", "gpio126";
		function = "gpio";
		function = "gpio";
	};
	};


	config {
	config {
		pins = "gpio91", "gpio127", "gpio128", "gpio35", "gpio126";
		pins = "gpio127", "gpio128", "gpio35", "gpio126";
		drive-strength = <2>;
		drive-strength = <2>;
		bias-pull-up;
		bias-pull-up;
	};
	};
@@ -142,8 +174,10 @@
	qcom,vdd-io-current-level = <200 22000>;
	qcom,vdd-io-current-level = <200 22000>;


	pinctrl-names = "active", "sleep";
	pinctrl-names = "active", "sleep";
	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on
	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
							&sd_eldo_active>;
	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off
							&sd_eldo_suspend>;


	cd-gpios = <&tlmm 67 0x0>;
	cd-gpios = <&tlmm 67 0x0>;