Merge "ARM: dts: msm: Add DTSi entry for IR LED" (65ae27bd) · Commits · e / devices / android_kernel_fairphone_FP3

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

+79 −0

Original line number	Diff line number	Diff line
		@@ -711,6 +711,59 @@ OIS MODULE
		Definition: This property is required if the clk is shared clk between different
		sensor and ois, if this device need to be opened together.

		=============================
		IRLED MODULE
		=============================

		- compatible
		Usage: required
		Value type: <string>
		Definition: Should be "qcom,camera-ir-led".

		- cell-index: cci hardware core index
		Usage: required
		Value type: <u32>
		Definition: Should specify the Hardware index id.

		- reg
		Usage: required
		Value type: <u32>
		Definition: offset and length of the register set
		for the device for the cci operating in
		compatible mode.

		- pinctrl-names
		Usage: required
		Value type: <string>
		Definition: List of names to assign the shared pin state defined in pinctrl device node

		- pinctrl-<0..n>
		Usage: required
		Value type: <phandle>
		Definition: Lists phandles each pointing to the pin configuration node within a pin

		- gpios
		Usage: required
		Value type: <phandle>
		Definition: should contain phandle to gpio controller node and array of
		#gpio-cells specifying specific gpio (controller specific)

		- gpio-req-tbl-num
		Usage: required
		Value type: <u32>
		Definition: should specify the gpio table index.

		- gpio-req-tbl-flags
		Usage: required
		Value type: <u32>
		Definition: should specify the gpio functions.

		- gpio-req-tbl-label
		Usage: required
		Value type: <string>
		Definition: should specify the gpio labels in
		gpio-req-tbl-num property (in the same order)

		Example:
		&soc {
		led_flash0: qcom,camera-flash@0 {
		@@ -721,6 +774,32 @@ Example:
		switch-source = <&pmi8998_switch>;
		status = "ok";
		};

		ir_led: qcom,camera-ir-led@0 {
		cell-index = <0>;
		reg = <0x00>;
		compatible = "qcom,camera-ir-led";
		enable-active-high;

		gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_ir_led_on>;
		pinctrl-1 = <&cam_sensor_ir_led_off>;
		gpios = <&tlmm 22 0>,
		<&tlmm 141 0>,
		<&tlmm 142 0>,
		<&tlmm 107 0>,
		<&tlmm 110 0>;
		gpio-req-tbl-num = <0 1 2 3 4>;
		gpio-req-tbl-flags = <0 0 0 0 0>;
		gpio-req-tbl-label = "CAM_IR_LED",
		"CAM_IR_LED_CUR0",
		"CAM_IR_LED_CUR1",
		"CAM_IR_CUT1",
		"CAM_IR_CUT2";
		status = "ok";
		};

		};

		&cam_cci0 {

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

+23 −5

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019, 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
		@@ -12,10 +12,28 @@
		*/

		&soc {
		led_flash_rear: qcom,camera-flash@0 {
		ir_led: qcom,camera-ir-led@0 {
		cell-index = <0>;
		reg = <0x00 0x00>;
		compatible = "qcom,camera-flash";
		reg = <0x00>;
		compatible = "qcom,camera-ir-led";
		enable-active-high;

		gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_ir_led_on>;
		pinctrl-1 = <&cam_sensor_ir_led_off>;
		gpios = <&tlmm 22 0>,
		<&tlmm 141 0>,
		<&tlmm 142 0>,
		<&tlmm 107 0>,
		<&tlmm 110 0>;
		gpio-req-tbl-num = <0 1 2 3 4>;
		gpio-req-tbl-flags = <0 0 0 0 0>;
		gpio-req-tbl-label = "CAM_IR_LED",
		"CAM_IR_LED_CUR0",
		"CAM_IR_LED_CUR1",
		"CAM_IR_CUT1",
		"CAM_IR_CUT2";
		status = "ok";
		};
		};
		@@ -34,7 +52,7 @@
		sensor-position-roll = <270>;
		sensor-position-pitch = <0>;
		sensor-position-yaw = <180>;
		led-flash-src = <&led_flash_rear>;
		ir-led-src = <&ir_led>;
		cam_vio-supply = <&pm660_l11>;
		cam_vana-supply = <&pm660_l15>;
		cam_vdig-supply = <&pm660_l5>;

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

+33 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2019, 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
		@@ -2301,6 +2301,38 @@
		};
		};

		cam_sensor_ir_led_on: cam_sensor_ir_led_on {
		/IR_LED/
		mux {
		pins = "gpio22", "gpio141", "gpio142",
		"gpio107", "gpio110";
		function = "gpio";
		};

		config {
		pins = "gpio22", "gpio141", "gpio142",
		"gpio107", "gpio110";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_ir_led_off: cam_sensor_ir_led_off {
		/IR_LED/
		mux {
		pins = "gpio22", "gpio141", "gpio142",
		"gpio107", "gpio110";
		function = "gpio";
		};

		config {
		pins = "gpio22", "gpio141", "gpio142",
		"gpio107", "gpio110";
		bias-pull-down; /* PULL DOWN */
		drive-strength = <2>; /* 2 MA */
		};
		};

		nx30p6093_intr_default: nx30p6093_intr_default {
		mux {
		pins = "gpio5";