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

Commit 503a1875 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: Add pinctrl overrides for SDA845 SVR platform"

parents af1357b7 ee617c50

arch/arm64/boot/dts/qcom/sda845-svr-pinctrl-overlay.dtsi

+142 −14
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
	config {

		pins = "gpio13";

		bias-disable; /* No PULL */

		drive-strength = <8>; /* 2 MA */

		drive-strength = <8>; /* 8 MA */

	};

};
@@ -34,19 +34,75 @@ 
	config {

		pins = "gpio13";

		bias-pull-down; /* PULL DOWN */

		drive-strength = <8>; /* 2 MA */

		drive-strength = <8>; /* 8 MA */

	};

};



&cam_sensor_mclk1_active {

	/* MCLK1 */

	mux {

		pins = "gpio14";

		function = "cam_mclk";

	};



	config {

		pins = "gpio14";

		bias-disable; /* No PULL */

		drive-strength = <8>; /* 8 MA */

	};

};



&cam_sensor_mclk1_suspend {

	/* MCLK1 */

	mux {

		pins = "gpio14";

		function = "cam_mclk";

	};



	config {

		pins = "gpio14";

		bias-pull-down; /* PULL DOWN */

		drive-strength = <8>; /* 8 MA */

	};

};



&cam_sensor_mclk2_active {

	/* MCLK2 */

	mux {

		pins = "gpio15";

		function = "cam_mclk";

	};



	config {

		pins = "gpio15";

		bias-disable; /* No PULL */

		drive-strength = <8>; /* 8 MA */

	};

};



&cam_sensor_mclk2_suspend {

	/* MCLK2 */

	mux {

		pins = "gpio15";

		function = "cam_mclk";

	};



	config {

		pins = "gpio15";

		bias-pull-down; /* PULL DOWN */

		drive-strength = <8>; /* 8 MA */

	};

};



&cam_sensor_rear_active {

	/* RESET, AVDD LDO */

	mux {

		pins = "gpio8","gpio79";

		pins = "gpio8", "gpio29";

		function = "gpio";

	};



	config {

		pins = "gpio8","gpio79";

		pins = "gpio8", "gpio29";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

	};
@@ -55,12 +111,12 @@ 
&cam_sensor_rear_suspend {

	/* RESET, AVDD LDO */

	mux {

		pins = "gpio8","gpio79";

		pins = "gpio8", "gpio29";

		function = "gpio";

	};



	config {

		pins = "gpio8","gpio79";

		pins = "gpio8", "gpio29";

		bias-pull-down; /* PULL DOWN */

		drive-strength = <2>; /* 2 MA */

		output-low;
@@ -70,12 +126,12 @@ 
&cam_sensor_front_active {

	/* RESET  AVDD_LDO */

	mux {

		pins = "gpio26", "gpio8";

		pins = "gpio26", "gpio12";

		function = "gpio";

	};



	config {

		pins = "gpio26", "gpio8";

		pins = "gpio26", "gpio12";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

	};
@@ -84,14 +140,86 @@ 
&cam_sensor_front_suspend {

	/* RESET */

	mux {

		pins = "gpio26", "gpio8";

		pins = "gpio26", "gpio12";

		function = "gpio";

	};



	config {

		pins = "gpio26", "gpio8";

		pins = "gpio26", "gpio12";

		bias-pull-down; /* PULL DOWN */

		drive-strength = <2>; /* 2 MA */

		output-low;

	};

};



&cam_sensor_iris_active {

	/* RESET  AVDD_LDO */

	mux {

		pins = "gpio21", "gpio122";

		function = "gpio";

	};



	config {

		pins = "gpio21", "gpio122";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

	};

};



&cam_sensor_iris_suspend {

	/* RESET  AVDD_LDO */

	mux {

		pins = "gpio21", "gpio122";

		function = "gpio";

	};



	config {

		pins = "gpio21", "gpio122";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

		output-low;

	};

};



&cam_sensor_rear_vana {

	/* AVDD_LDO */

	mux {

		pins = "gpio7";

		function = "gpio";

	};



	config {

		pins = "gpio7";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

	};

};



&cam_res_mgr_active {

	/* AVDD_LDO */

	mux {

		pins = "gpio79";

		function = "gpio";

	};



	config {

		pins = "gpio79";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

	};

};



&cam_res_mgr_suspend {

	/* AVDD_LDO */

	mux {

		pins = "gpio79";

		function = "gpio";

	};



	config {

		pins = "gpio79";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

		output-low;

	};

};

arch/arm64/boot/dts/qcom/sda845-svr.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -252,6 +252,24 @@ 
	#cooling-cells = <2>;

};



&pm8998_l10 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	qcom,init-voltage = <1800000>;

};



&pm8998_l15 {

	regulator-min-microvolt = <1504000>;

	regulator-max-microvolt = <1504000>;

	qcom,init-voltage = <1504000>;

};



&pm8998_l16 {

	regulator-min-microvolt = <3312000>;

	regulator-max-microvolt = <3312000>;

	qcom,init-voltage = <3312000>;

};



&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v3";

arch/arm64/boot/dts/qcom/sdm845-camera-sensor-svr.dtsi

+19 −17
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 
				 &cam_sensor_rear2_suspend>;

		gpios = <&tlmm 15 0>,

			<&tlmm 9 0>,

			<&tlmm 8 0>;

			<&tlmm 7 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

		gpio-req-tbl-num = <0 1 2>;
@@ -261,7 +261,7 @@ 
				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 14 0>,

			<&tlmm 28 0>,

			<&tlmm 8 0>;

			<&tlmm 7 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

		gpio-req-tbl-num = <0 1 2>;
@@ -441,37 +441,39 @@ 
		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		led-flash-src = <&led_flash_iris>;

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&pmi8998_bob>;

		cam_vdig-supply = <&camera_ldo>;

		cam_vio-supply = <&pm8998_l9>;

		cam_vana-supply = <&pm8998_l16>;

		cam_vdig-supply = <&pm8998_l10>;

		cam_clk-supply = <&titan_top_gdsc>;

		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 3312000 1050000 0>;

		rgltr-max-voltage = <0 3600000 1050000 0>;

		rgltr-min-voltage = <1800000 3312000 1800000 0>;

		rgltr-max-voltage = <1800000 3312000 1800000 0>;

		rgltr-load-current = <0 80000 105000 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk3_active

		pinctrl-0 = <&cam_sensor_mclk2_active

				 &cam_sensor_iris_active>;

		pinctrl-1 = <&cam_sensor_mclk3_suspend

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_iris_suspend>;

		gpios = <&tlmm 16 0>,

			<&tlmm 9 0>,

			<&tlmm 8 0>;

		gpios = <&tlmm 15 0>,

			<&tlmm 21 0>,

			<&tlmm 122 0>,

			<&tlmm 59 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

		gpio-req-tbl-num = <0 1 2>;

		gpio-req-tbl-flags = <1 0 0>;

		gpio-vdig = <3>;

		gpio-req-tbl-num = <0 1 2 3>;

		gpio-req-tbl-flags = <1 0 0 0>;

		gpio-req-tbl-label = "CAMIF_MCLK3",

					"CAM_RESET3",

					"CAM_VANA1";

					"CAM_VANA3",

					"CAM_VDIG3";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;