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

Commit 83f55155 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add flash node for rear aux camera in SDM670 dtsi" into dev/msm-4.9-camx

parents 1dc21996 6ef2d535

arch/arm64/boot/dts/qcom/sdm670-camera-sensor-cdp.dtsi

+13 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -22,10 +22,20 @@ 
		status = "ok";

	};



	led_flash_front: qcom,camera-flash@1 {

	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		reg = <0x01 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm660l_flash0 &pm660l_flash1>;

		torch-source = <&pm660l_torch0 &pm660l_torch1>;

		switch-source = <&pm660l_switch0>;

		status = "ok";

	};



	led_flash_front: qcom,camera-flash@2 {

		cell-index = <2>;

		reg = <0x02 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm660l_flash2>;

		torch-source = <&pm660l_torch2>;

		switch-source = <&pm660l_switch1>;
@@ -309,6 +319,7 @@ 
		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&camera_vio_ldo>;

		cam_vana-supply = <&camera_vana_ldo>;

arch/arm64/boot/dts/qcom/sdm670-camera-sensor-mtp.dtsi

+13 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -22,10 +22,20 @@ 
		status = "ok";

	};



	led_flash_front: qcom,camera-flash@1 {

	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		reg = <0x01 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm660l_flash0 &pm660l_flash1>;

		torch-source = <&pm660l_torch0 &pm660l_torch1>;

		switch-source = <&pm660l_switch0>;

		status = "ok";

	};



	led_flash_front: qcom,camera-flash@2 {

		cell-index = <2>;

		reg = <0x02 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm660l_flash2>;

		torch-source = <&pm660l_torch2>;

		switch-source = <&pm660l_switch1>;
@@ -309,6 +319,7 @@ 
		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&camera_vio_ldo>;

		cam_vana-supply = <&camera_vana_ldo>;

arch/arm64/boot/dts/qcom/sdm670-camera-sensor-qrd.dtsi

+12 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -22,6 +22,16 @@ 
		status = "ok";

	};



	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		reg = <0x01 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm660l_flash0 &pm660l_flash1>;

		torch-source = <&pm660l_torch0 &pm660l_torch1>;

		switch-source = <&pm660l_switch0>;

		status = "ok";

	};



	actuator_regulator: gpio-regulator@0 {

		compatible = "regulator-fixed";

		reg = <0x00 0x00>;
@@ -386,7 +396,7 @@ 
		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear>;

		led-flash-src = <&led_flash_rear_aux>;

		actuator-src = <&actuator_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&cam_iovdd_gpio_regulator>;