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

Commit 8276c8ca authored by Harsh Shah's avatar Harsh Shah
Browse files

Revert "ARM: dts: msm: Add camera dts for sm6150" 



This reverts commit d97e6650. The original
commit is causing conflicts with upstream changes because of common files
modified. Reverting it and will reupload after pulling in the upstream
changes and rebasing this change on top of it. This way there will be no
conflict when we try to upstream the changes.

Change-Id: I6c126e6a773dfeb06edad69314663a2a1ba020be
Signed-off-by: default avatarHarsh Shah <harshs@codeaurora.org>
parent f19f0dbb

Documentation/devicetree/bindings/media/video/msm-cam-csiphy.txt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ First Level Node - CSIPHY device 
  Usage: required

  Value type: <string>

  Definition: Should be "qcom,csiphy-v1.0",

	"qcom,csiphy-v1.1", "qcom,csiphy-v2.0", "qcom,csiphy".

	"qcom,csiphy-v1.1", "qcom,csiphy".



- cell-index: csiphy hardware core index

  Usage: required

arch/arm64/boot/dts/qcom/sm6150-camera-sensor-idp.dtsi

deleted100644 → 0
+0 −378
Original line number Diff line number Diff line 
/*

 * Copyright (c) 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {



	led_flash_rear: qcom,camera-flash@0 {

		cell-index = <0>;

		reg = <0x00 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm6150l_flash0>;

		torch-source = <&pm6150l_torch1>;

		switch-source = <&pm6150l_switch0>;

		status = "ok";

	};



	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		reg = <0x01 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm6150l_flash1>;

		torch-source = <&pm6150l_torch1>;

		switch-source = <&pm6150l_switch1>;

		status = "ok";

	};



	led_flash_front: qcom,camera-flash@2 {

		cell-index = <2>;

		reg = <0x02 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm6150l_flash2>;

		torch-source = <&pm6150l_torch2>;

		switch-source = <&pm6150l_switch2>;

		status = "ok";

		enable-active-high;

		gpio = <&tlmm 38 0>;

		pinctrl-names = "default";

		pinctrl-0 = <&flash_led3_front_en>;

	};



	camera_ldo: gpio-regulator@0 {

		compatible = "regulator-fixed";

		reg = <0x00 0x00>;

		regulator-name = "camera_ldo";

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

		regulator-enable-ramp-delay = <135>;

		enable-active-high;

		gpio = <&pm6150l_gpios 3 0>;

		pinctrl-names = "default";

		pinctrl-0 = <&cam_sensor_dvdd_en>;

		vin-supply = <&pm6150l_s8>;

	};



	camera_vana0_ldo: gpio-regulator@1 {

		compatible = "regulator-fixed";

		reg = <0x01 0x00>;

		regulator-name = "camera_vana0_ldo";

		regulator-min-microvolt = <2850000>;

		regulator-max-microvolt = <2850000>;

		regulator-enable-ramp-delay = <233>;

		enable-active-high;

		gpio = <&pm6150l_gpios 9 0>;

		pinctrl-names = "default";

		pinctrl-0 = <&cam_sensor_0_vana>;

		vin-supply = <&pm6150l_bob>;

	};



	camera_vana1_2_ldo: gpio-regulator@2 {

		compatible = "regulator-fixed";

		reg = <0x02 0x00>;

		regulator-name = "camera_vana1_2_ldo";

		regulator-min-microvolt = <2850000>;

		regulator-max-microvolt = <2850000>;

		regulator-enable-ramp-delay = <233>;

		enable-active-high;

		gpio = <&pm6150l_gpios 4 0>;

		pinctrl-names = "default";

		pinctrl-0 = <&cam_sensor_1_2_vana>;

		vin-supply = <&pm6150l_bob>;

	};

};



&cam_cci {

	qcom,cam-res-mgr {

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

		status = "ok";

	};



	actuator_rear: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,actuator";

		cci-master = <0>;

		cam_vaf-supply = <&pm6150_l19>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <0>;

	};



	actuator_front: qcom,actuator@1 {

		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,actuator";

		cci-master = <1>;

		cam_vaf-supply = <&pm6150_l19>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <0>;

	};



	ois_rear: qcom,ois@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,ois";

		cci-master = <0>;

		cam_vaf-supply = <&pm6150_l19>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <0>;

		status = "disabled";

	};



	eeprom_rear: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana0_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm6150_l19>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2850000 1200000 0 2800000>;

		rgltr-max-voltage = <1800000 2850000 1200000 0 2800000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_rear_suspend>;

		gpios = <&tlmm 28 0>,

			<&tlmm 47 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET0";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	eeprom_rear_aux: qcom,eeprom@1 {

		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana1_2_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm6150_l19>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2850000 1200000 0 2800000>;

		rgltr-max-voltage = <1800000 2850000 1200000 0 2800000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_rear2_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_rear2_suspend>;

		gpios = <&tlmm 29 0>,

			<&tlmm 45 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET1";

		sensor-position = <0>;

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	eeprom_front: qcom,eeprom@2 {

		cell-index = <2>;

		reg = <0x2>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana1_2_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm6150_l19>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2850000 1200000 0 2800000>;

		rgltr-max-voltage = <1800000 2850000 1200000 0 2800000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

				 &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 30 0>,

			<&tlmm 37 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET2";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@0 {

		cell-index = <0>;

		compatible = "qcom,cam-sensor";

		reg = <0x0>;

		csiphy-sd-index = <0>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear>;

		actuator-src = <&actuator_rear>;

		ois-src = <&ois_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana0_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2850000 1200000 0>;

		rgltr-max-voltage = <1800000 2850000 1200000 0>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_rear_suspend>;

		gpios = <&tlmm 28 0>,

			<&tlmm 47 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET0";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@1 {

		cell-index = <1>;

		compatible = "qcom,cam-sensor";

		reg = <0x1>;

		csiphy-sd-index = <1>;

		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 = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana1_2_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2850000 1200000 0>;

		rgltr-max-voltage = <1800000 2850000 1200000 0>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_rear2_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_rear2_suspend>;

		gpios = <&tlmm 29 0>,

			<&tlmm 45 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET1";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@2 {

		cell-index = <2>;

		compatible = "qcom,cam-sensor";

		reg = <0x02>;

		csiphy-sd-index = <2>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		eeprom-src = <&eeprom_front>;

		actuator-src = <&actuator_front>;

		led-flash-src = <&led_flash_front>;

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana1_2_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2850000 1200000 0>;

		rgltr-max-voltage = <1800000 2850000 1200000 0>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

				 &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 30 0>,

			<&tlmm 37 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET2";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};

arch/arm64/boot/dts/qcom/sm6150-camera.dtsi

deleted100644 → 0
+0 −1055

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/qcom/sm6150-idp-overlay.dts

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
/plugin/;



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/clock/qcom,camcc-sm6150.h>



#include "sm6150-idp.dtsi"

arch/arm64/boot/dts/qcom/sm6150-idp.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 * GNU General Public License for more details.

 */



#include "sm6150-camera-sensor-idp.dtsi"

&soc {

};