From a5194afbf1073362ae4a07c53c29dfca768f7aae Mon Sep 17 00:00:00 2001 From: Frank Chen Date: Sun, 17 Jul 2016 15:03:07 -0700 Subject: [PATCH] arm64: dts: Update IMX185 DT settings 1. Move UseDecibelGain flag from mode setting to global settins 2. Update gain decibel range 3. Update FPS range Bug 1789332 Bug CHWI-246 Change-Id: Iba3cfcc44f0606fc3dc691b1f6981b59302fb5fb Signed-off-by: Frank Chen Reviewed-on: http://git-master/r/1183842 Reviewed-by: mobile promotions Tested-by: mobile promotions --- ...a210-jetson-cv-camera-li-mipi-adpt-a00.dts | 18 ++++++++++----- .../tegra210-camera-li-mipi-adpt-a00.dtsi | 22 +++++++++---------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/arch/arm64/boot/dts/tegra210-jetson-cv-camera-li-mipi-adpt-a00.dts b/arch/arm64/boot/dts/tegra210-jetson-cv-camera-li-mipi-adpt-a00.dts index 169f7e1bbc1..6e2cbcff89f 100644 --- a/arch/arm64/boot/dts/tegra210-jetson-cv-camera-li-mipi-adpt-a00.dts +++ b/arch/arm64/boot/dts/tegra210-jetson-cv-camera-li-mipi-adpt-a00.dts @@ -19,6 +19,7 @@ / { tegra-camera-platform { modules { + /delete-node/ module1; /delete-node/ module2; /delete-node/ module3; /delete-node/ module4; @@ -36,12 +37,18 @@ host1x { vi { ports { - /delete-node/ port@2; - /delete-node/ port@3; - /delete-node/ port@4; - /delete-node/ port@5; + vi_port0: port@0 { + status = "okay"; + vi_in0: endpoint { + status = "okay"; + }; + }; + /delete-node/ port@1; + /delete-node/ port@2; + /delete-node/ port@3; + /delete-node/ port@4; + /delete-node/ port@5; }; - }; i2c@546c0000 { @@ -53,6 +60,7 @@ }; i2c@7000c000 { + /delete-node/ ov23850_c@36; /delete-node/ lc898212@72; }; diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-li-mipi-adpt-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-li-mipi-adpt-a00.dtsi index cf9fca00931..46ef6d7cfb8 100644 --- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-li-mipi-adpt-a00.dtsi +++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-li-mipi-adpt-a00.dtsi @@ -64,6 +64,9 @@ /* crop co-ordinates */ post_crop_frame_drop = "0"; + /* Convert Gain to unit of dB (decibel) befor passing to kernel driver */ + use_decibel_gain = "true"; + /** * A modeX node is required to support v4l2 driver * implementation with NVIDIA camera software stack @@ -87,9 +90,6 @@ * MIPI lane settle time value. * A "0" value attempts to autocalibrate based on mclk_multiplier * - * use_decibel_gain = "true"; - * Used to determine whether convert sensor gain(times) to decibel gain in imager - * * active_w = ""; * Pixel active region width * @@ -153,7 +153,6 @@ discontinuous_clk = "no"; dpcm_enable = "false"; cil_settletime = "0"; - use_decibel_gain = "true"; active_w = "1920"; active_h = "1080"; @@ -164,11 +163,11 @@ mclk_multiplier = "6"; pix_clk_hz = "74250000"; - min_gain_val = "1"; - max_gain_val = "255"; + min_gain_val = "0"; /* dB */ + max_gain_val = "48"; /* dB */ min_hdr_ratio = "1"; max_hdr_ratio = "1"; - min_framerate = "30"; + min_framerate = "1"; max_framerate = "30"; min_exp_time = "30"; max_exp_time = "33000"; @@ -182,7 +181,6 @@ discontinuous_clk = "no"; dpcm_enable = "false"; cil_settletime = "0"; - use_decibel_gain = "true"; active_w = "1920"; active_h = "1080"; @@ -193,11 +191,11 @@ mclk_multiplier = "6"; pix_clk_hz = "74250000"; - min_gain_val = "1"; - max_gain_val = "4"; + min_gain_val = "0"; /* dB */ + max_gain_val = "48"; /* dB */ min_hdr_ratio = "16"; max_hdr_ratio = "16"; - min_framerate = "30"; + min_framerate = "1"; max_framerate = "30"; min_exp_time = "30"; max_exp_time = "33000"; @@ -243,6 +241,7 @@ badge = "imx185_bottom_liimx185"; position = "bottom"; orientation = "0"; + status = "okay"; drivernode0 { /* Declare PCL support driver (classically known as guid) */ pcl_id = "v4l2_sensor"; @@ -250,6 +249,7 @@ devname = "imx185 6-001a"; /* Declare the device-tree hierarchy to driver instance */ proc-device-tree = "/proc/device-tree/host1x/i2c@546c0000/tca9546@70/i2c@0/imx185_a@1a"; + status = "okay"; }; }; }; -- 2.39.2