drivers: camera: CPHY calibration support

Add proper phy mode read support from device tree
to distinguish CPHY and DPHY sensor modes.
Fix CPHY calibration flow to write CPHY mode
and complete calibration.

Bug 1946718

Change-Id: I801965207a6777aa71cc5fc24fcb0a7e0c487093
Signed-off-by: Bhanu Murthy V <bmurthyv@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1639635
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

7 files changed, 124 insertions, 56 deletions

diff --git a/drivers/media/platform/tegra/camera/csi/csi.c b/drivers/media/platform/tegra/camera/csi/csi.c
index bf7bb744f..c140b1b5e 100644
--- a/drivers/media/platform/tegra/camera/csi/csi.c
+++ b/drivers/media/platform/tegra/camera/csi/csi.c
@@ -1,7 +1,7 @@
 /*
  * NVIDIA Tegra CSI Device
  *
- * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Author: Bryan Wu <pengw@nvidia.com>
  *
@@ -72,6 +72,69 @@ static void update_blank_intervals(struct tegra_csi_channel *chan,
         port->v_blank = tegra_csi_tpg_frmfmt[fmtindex].v_blank;
 }
 
+static struct sensor_mode_properties*
+read_mode_from_dt(struct camera_common_data *s_data)
+{
+        struct sensor_mode_properties *mode = NULL;
+
+        if (s_data) {
+                int idx = s_data->mode_prop_idx;
+
+                if (idx < s_data->sensor_props.num_modes)
+                        mode = &s_data->sensor_props.sensor_modes[idx];
+        }
+
+        return mode;
+}
+
+u32 read_settle_time_from_dt(struct tegra_csi_channel *chan)
+{
+        struct camera_common_data *s_data = chan->s_data;
+        struct sensor_mode_properties *mode = read_mode_from_dt(s_data);
+        struct device *dev = chan->csi->dev;
+        unsigned int cil_settletime = 0;
+
+        if (mode) {
+                dev_dbg(dev, "settle time reading from props\n");
+                cil_settletime = mode->signal_properties.cil_settletime;
+        } else if (chan->of_node) {
+                int err = 0;
+                const char *str;
+
+                dev_dbg(dev, "settle time reading from of_node\n");
+                err = of_property_read_string(chan->of_node, "cil_settletime",
+                        &str);
+                if (!err) {
+                        err = kstrtou32(str, 10, &cil_settletime);
+                        if (err) {
+                                dev_dbg(dev,
+                                        "no cil_settletime in of_node");
+                                cil_settletime = 0;
+                        }
+                }
+        }
+
+        return cil_settletime;
+}
+
+u32 read_phy_mode_from_dt(struct tegra_csi_channel *chan)
+{
+        struct camera_common_data *s_data = chan->s_data;
+        struct sensor_mode_properties *mode = read_mode_from_dt(s_data);
+        struct device *dev = chan->csi->dev;
+        u32 phy_mode = 0;
+
+        if (mode) {
+                dev_dbg(dev, "settle time reading from props\n");
+                phy_mode = mode->signal_properties.phy_mode;
+        } else {
+                dev_dbg(dev, "phy mode unavailable in props, use default\n");
+                phy_mode = CSI_PHY_MODE_DPHY;
+        }
+
+        return phy_mode;
+}
+
 void set_csi_portinfo(struct tegra_csi_device *csi,
         unsigned int port, unsigned int numlanes)
 {
diff --git a/drivers/media/platform/tegra/camera/csi/csi4_fops.c b/drivers/media/platform/tegra/camera/csi/csi4_fops.c
index fee0f47d3..0e264e6fb 100644
--- a/drivers/media/platform/tegra/camera/csi/csi4_fops.c
+++ b/drivers/media/platform/tegra/camera/csi/csi4_fops.c
@@ -1,7 +1,7 @@
 /*
  * Tegra CSI4 device common APIs
  *
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Author: Frank Chen <frankc@nvidia.com>
  *
@@ -102,14 +102,11 @@ static void csi4_stream_config(struct tegra_csi_channel *chan, int port_num)
                         __func__, port_num, val);
 }
 
-
 static void csi4_phy_config(
         struct tegra_csi_channel *chan, int csi_port,
         int csi_lanes, bool enable)
 {
         struct tegra_csi_device *csi = chan->csi;
-        struct camera_common_data *s_data = chan->s_data;
-        const struct sensor_mode_properties *mode = NULL;
         int phy_num = (csi_port & 0x6) >> 1;
         bool cil_a = (csi_port & 0x1) ? false : true;
         int cil_config;
@@ -117,12 +114,14 @@ static void csi4_phy_config(
         const unsigned int cil_clk_mhz = TEGRA_CSICIL_CLK_MHZ;
         const unsigned int csi_clk_mhz = csi->clk_freq / 1000000;
         /* Calculated clock settling times for cil and csi clocks */
-        unsigned int cil_settletime = 0;
+        unsigned int cil_settletime = read_settle_time_from_dt(chan);
         unsigned int csi_settletime;
+        u32 phy_mode = read_phy_mode_from_dt(chan);
 
         dev_dbg(csi->dev, "%s\n", __func__);
 
-        if (csi_lanes == 3) /* set to CPHY */
+
+        if (phy_mode == CSI_PHY_MODE_CPHY) /* set to CPHY */
                 csi4_phy_write(chan, phy_num, NVCSI_CIL_PHY_CTRL, CPHY);
         else /* set to DPHY */
                 csi4_phy_write(chan, phy_num, NVCSI_CIL_PHY_CTRL, DPHY);
@@ -186,36 +185,6 @@ static void csi4_phy_config(
         /* power on de-serializer */
         csi4_phy_write(chan, phy_num, NVCSI_CIL_PAD_CONFIG, 0);
 
-        /* Attempt to find the cil_settingtime from the device tree */
-        if (s_data) {
-                int idx = s_data->mode_prop_idx;
-
-                dev_dbg(csi->dev, "cil_settingtime is pulled from device");
-                if (idx < s_data->sensor_props.num_modes) {
-                        mode = &s_data->sensor_props.sensor_modes[idx];
-                        cil_settletime = mode->signal_properties.cil_settletime;
-                } else {
-                        dev_dbg(csi->dev, "mode not listed in DT, use default");
-                        cil_settletime = 0;
-                }
-        } else if (chan->of_node) {
-                int err = 0;
-                const char *str;
-
-                dev_dbg(csi->dev,
-                        "cil_settletime is pulled from device of_node");
-                err = of_property_read_string(chan->of_node, "cil_settletime",
-                        &str);
-                if (!err) {
-                        err = kstrtou32(str, 10, &cil_settletime);
-                        if (err) {
-                                dev_dbg(csi->dev,
-                                        "no cil_settletime in of_node");
-                                cil_settletime = 0;
-                        }
-                }
-        }
-
         /* calculate MIPI settling times */
         dev_dbg(csi->dev, "cil core clock: %u, csi clock: %u", cil_clk_mhz,