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

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

Merge "ARM: dts: msm: Add PD & EUD support on Khaje"

parents 01c01b17 ba24f06e

qcom/khaje-idp-pm7250b.dtsi

+38 −0
Original line number Diff line number Diff line
@@ -111,3 +111,41 @@ 
	qcom,platform-en-gpio = <&pm7250b_gpios 5 0>;

	qcom,platform-bklight-en-gpio = <&pm7250b_gpios 1 0>;

};



&cam_res_mgr_label {

	gpios = <&pm7250b_gpios 4 0>;

};



&led_flash_rear {

	gpios = <&pm7250b_gpios 4 0>;

};



&led_flash_rear_aux {

	gpios = <&pm7250b_gpios 4 0>;

};



&led_flash_rear_aux2 {

	gpios = <&pm7250b_gpios 4 0>;

};



&pm7250b_charger {

	dpdm-supply = <&usb2_phy0>;



	smb5_vbus: qcom,smb5-vbus {

		regulator-name = "smb5-vbus";

	};



	smb5_vconn: qcom,smb5-vconn {

		regulator-name = "smb5-vconn";

	};

};



&pm7250b_pdphy {

	vdd-pdphy-supply = <&L15A>;

	vbus-supply = <&smb5_vbus>;

	vconn-supply = <&smb5_vconn>;

};



&usb0 {

	extcon = <&pm7250b_pdphy>, <&pm7250b_charger>, <&eud>;

};

qcom/khaje-pinctrl.dtsi

+0 −58
Original line number Diff line number Diff line
@@ -3,35 +3,6 @@ 
&tlmm {

		compatible = "qcom,khaje-pinctrl";



		cam_flash_strobe_active: cam_flash_strobe_active {

			/* STROBE */

			mux {

				pins = "gpio2";

				function = "gpio";

			};



			config {

				pins = "gpio2";

				bias-disable; /* No PULL */

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

			};

		};



		cam_flash_strobe_suspend: cam_flash_strobe_suspend {

			/* STROBE */

			mux {

				pins = "gpio2";

				function = "gpio";

			};



			config {

				pins = "gpio2";

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

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

				output-low;

			};

		};



		cam_flash_torch_active: cam_flash_torch_active {

			/* TORCH */

			mux {
@@ -61,35 +32,6 @@ 
			};

		};



		cam_flash_hwen_active: cam_flash_hwen_active {

			/* HWEN */

			mux {

				pins = "gpio4";

				function = "gpio";

			};



			config {

				pins = "gpio4";

				bias-disable; /* No PULL */

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

			};

		};



		cam_flash_hwen_suspend: cam_flash_hwen_suspend {

			/* HWEN */

			mux {

				pins = "gpio4";

				function = "gpio";

			};



			config {

				pins = "gpio4";

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

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

				output-low;

			};

		};



		cam_flash_tx_active: cam_flash_tx_active {

			/* TX */

			mux {

qcom/khaje-qrd-pm7250b.dtsi

+38 −0
Original line number Diff line number Diff line
@@ -115,3 +115,41 @@ 
	qcom,vbatt-empty-cold-mv = <3100>;

	qcom,use-cp-iin-sns;

};



&cam_res_mgr_label {

	gpios = <&pm7250b_gpios 4 0>;

};



&led_flash_rear {

	gpios = <&pm7250b_gpios 4 0>;

};



&led_flash_rear_aux {

	gpios = <&pm7250b_gpios 4 0>;

};



&led_flash_rear_aux2 {

	gpios = <&pm7250b_gpios 4 0>;

};



&pm7250b_charger {

	dpdm-supply = <&usb2_phy0>;



	smb5_vbus: qcom,smb5-vbus {

		regulator-name = "smb5-vbus";

	};



	smb5_vconn: qcom,smb5-vconn {

		regulator-name = "smb5-vconn";

	};

};



&pm7250b_pdphy {

	vdd-pdphy-supply = <&L15A>;

	vbus-supply = <&smb5_vbus>;

	vconn-supply = <&smb5_vconn>;

};



&usb0 {

	extcon = <&pm7250b_pdphy>, <&pm7250b_charger>, <&eud>;

};