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

Commit e99ef36b authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add shared gpio node for I2C flash for blair" into camera-kernel.lnx.4.0

parents 2bf57962 f3878fad

blair-camera-sensor-cdp.dtsi

+52 −2
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 
	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

		gpios-shared = <407>;

		pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend";

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

	};

};
@@ -118,6 +122,52 @@ 
		status = "ok";

	};



	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		compatible = "qcom,camera-flash";

		cci-master = <1>;

		flash-type = <CAM_FLASH_TYPE_I2C>;

		cam_vio-supply = <&L6P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

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

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

		gpio-req-tbl-label = "CUSTOM_GPIO1";

		status = "ok";

	};



	led_flash_rear_aux2: qcom,camera-flash@2 {

		cell-index = <2>;

		compatible = "qcom,camera-flash";

		cci-master = <1>;

		flash-type = <CAM_FLASH_TYPE_I2C>;

		cam_vio-supply = <&L6P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

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

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

		gpio-req-tbl-label = "CUSTOM_GPIO1";

		status = "ok";

	};



	/* Rear*/

	qcom,cam-sensor0 {

		cell-index = <0>;
@@ -171,7 +221,7 @@ 
		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear>;

		led-flash-src = <&led_flash_rear_aux2>;

		eeprom-src = <&eeprom_rear_aux2>;

		cam_vio-supply = <&L6P>;

		cam_vana-supply = <&L3P>;
@@ -345,7 +395,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&L6P>;

		cam_vana-supply = <&L7P>;

blair-camera-sensor-mtp.dtsi

+52 −2
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 
	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

		gpios-shared = <407>;

		pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend";

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

	};

};
@@ -118,6 +122,52 @@ 
		status = "ok";

	};



	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		compatible = "qcom,camera-flash";

		cci-master = <1>;

		flash-type = <CAM_FLASH_TYPE_I2C>;

		cam_vio-supply = <&L6P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

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

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

		gpio-req-tbl-label = "CUSTOM_GPIO1";

		status = "ok";

	};



	led_flash_rear_aux2: qcom,camera-flash@2 {

		cell-index = <2>;

		compatible = "qcom,camera-flash";

		cci-master = <1>;

		flash-type = <CAM_FLASH_TYPE_I2C>;

		cam_vio-supply = <&L6P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

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

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

		gpio-req-tbl-label = "CUSTOM_GPIO1";

		status = "ok";

	};



	/* Rear*/

	qcom,cam-sensor0 {

		cell-index = <0>;
@@ -171,7 +221,7 @@ 
		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear>;

		led-flash-src = <&led_flash_rear_aux2>;

		eeprom-src = <&eeprom_rear_aux2>;

		cam_vio-supply = <&L6P>;

		cam_vana-supply = <&L3P>;
@@ -415,7 +465,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&L6P>;

		cam_vana-supply = <&L7P>;