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

Commit f660c43e authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add Camera sensor nodes to sdmmagpie" into dev/msm-4.14-camx

parents be8f4b15 37df9fa7

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

0 → 100644
+347 −0
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 &pm6150l_flash1>;

		torch-source = <&pm6150l_torch0 &pm6150l_torch1>;

		switch-source = <&pm6150l_switch2 &pm6150l_switch2>;

		status = "ok";

	};



	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		reg = <0x01 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm6150l_flash0 &pm6150l_flash1>;

		torch-source = <&pm6150l_torch0 &pm6150l_torch1>;

		switch-source = <&pm6150l_switch2 &pm6150l_switch2>;

		status = "ok";

	};

};



&cam_cci0 {

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

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2900000>;

		rgltr-max-voltage = <2900000>;

		rgltr-load-current = <100000>;

	};



	actuator_rear_aux: qcom,actuator@1 {

		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,actuator";

		cci-master = <1>;

		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2900000>;

		rgltr-max-voltage = <2900000>;

		rgltr-load-current = <100000>;

	};



	eeprom_rear: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0>;

		compatible = "qcom,eeprom";

		actuator-src = <&actuator_rear>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l4>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

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

		rgltr-max-voltage = <1800000 2850000 1100000 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 13 0>,

			<&pm8009_gpios 1 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";

		actuator-src = <&actuator_rear_aux>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l4>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

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

		rgltr-max-voltage = <1800000 2800000 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 14 0>,

			<&pm8009_gpios 2 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 = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2800000 1040000 0>;

		rgltr-max-voltage = <1800000 2800000 1040000 0>;

		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 15 0>,

			<&pm8009_gpios 4 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 = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear>;

		eeprom-src = <&eeprom_rear>;

		actuator-src = <&actuator_rear>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l4>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

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

		rgltr-max-voltage = <1800000 2850000 1100000 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 13 0>,

			<&pm8009_gpios 1 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 = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		actuator-src = <&actuator_rear_aux>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l4>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

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

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

		rgltr-load-current = <0 80000 105000 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 14 0>,

			<&pm8009_gpios 2 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>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2800000 1040000 0>;

		rgltr-max-voltage = <1800000 2800000 1040000 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 15 0>,

			<&pm8009_gpios 4 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-device = <1>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};





&pm8009_gpios {

	cam_sensor_rear_active: cam_sensor_rear_active {

		pins = "gpio1";

		function = "normal";

		power-source = <0>;

		bias-disable;

	};

	cam_sensor_rear_suspend: cam_sensor_rear_suspend {

		pins = "gpio1";

		function = "normal";

		power-source = <0>;

		bias-pull-down;

	};



	cam_sensor_rear2_active: cam_sensor_rear2_active {

		pins = "gpio2";

		function = "normal";

		power-source = <0>;

		bias-disable;

	};

	cam_sensor_rear2_suspend: cam_sensor_rear2_suspend {

		pins = "gpio2";

		function = "normal";

		power-source = <0>;

		bias-pull-down;

	};



	cam_sensor_front_active: cam_sensor_front_active {

		pins = "gpio4";

		function = "normal";

		power-source = <0>;

		bias-disable;

	};

	cam_sensor_front_suspend: cam_sensor_front_suspend {

		pins = "gpio4";

		function = "normal";

		power-source = <0>;

		bias-pull-down;

	};

};

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

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



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

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



#include "sdmmagpie-idp.dtsi"

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

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "sdmmagpie-thermal-overlay.dtsi"



#include <dt-bindings/gpio/gpio.h>

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



&soc {

};

arch/arm64/boot/dts/qcom/sdmmagpie-pinctrl.dtsi

+112 −0
Original line number Diff line number Diff line
@@ -951,6 +951,118 @@ 
			};

		};



		cam_sensor_mclk0_active: cam_sensor_mclk0_active {

			/* MCLK0 */

			mux {

				pins = "gpio13";

				function = "cam_mclk";

			};



			config {

				pins = "gpio13";

				bias-disable; /* No PULL */

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

			};

		};



		cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend {

			/* MCLK0 */

			mux {

				pins = "gpio13";

				function = "cam_mclk";

			};



			config {

				pins = "gpio13";

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

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

			};

		};



		cam_sensor_mclk1_active: cam_sensor_mclk1_active {

			/* MCLK1 */

			mux {

				pins = "gpio14";

				function = "cam_mclk";

			};



			config {

				pins = "gpio14";

				bias-disable; /* No PULL */

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

			};

		};



		cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend {

			/* MCLK1 */

			mux {

				pins = "gpio14";

				function = "cam_mclk";

			};



			config {

				pins = "gpio14";

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

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

			};

		};



		cam_sensor_mclk2_active: cam_sensor_mclk2_active {

			/* MCLK2 */

			mux {

				pins = "gpio15";

				function = "cam_mclk";

			};



			config {

				pins = "gpio15";

				bias-disable; /* No PULL */

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

			};

		};



		cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend {

			/* MCLK2 */

			mux {

				pins = "gpio15";

				function = "cam_mclk";

			};



			config {

				pins = "gpio15";

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

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

			};

		};



		cam_sensor_mclk3_active: cam_sensor_mclk3_active {

			/* MCLK3 */

			mux {

				pins = "gpio16";

				function = "cam_mclk";

			};



			config {

				pins = "gpio16";

				bias-disable; /* No PULL */

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

			};

		};



		cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend {

			/* MCLK3 */

			mux {

				pins = "gpio16";

				function = "cam_mclk";

			};



			config {

				pins = "gpio16";

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

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

			};

		};



		/* SDC pin type */

		sdc1_clk_on: sdc1_clk_on {

			config {

arch/arm64/boot/dts/qcom/sdmmagpie-qrd-overlay.dts

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



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

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



#include "sdmmagpie-qrd.dtsi"