5 files changed, 264 insertions, 2 deletions

diff --git a/drivers/media/platform/tegra/camera/Makefile b/drivers/media/platform/tegra/camera/Makefile
index 8072676a8..a67a6a0cc 100644
--- a/drivers/media/platform/tegra/camera/Makefile
+++ b/drivers/media/platform/tegra/camera/Makefile
@@ -8,7 +8,7 @@ ccflags-y += -Werror
 obj-y += vi/
 obj-y += csi/
 obj-y += camera_common.o camera_gpio.o sensor_common.o camera_version_utils.o \
-        tegracam_ctrls.o tegracam_core.o tegracam_v4l2.o
+        tegracam_ctrls.o tegracam_core.o tegracam_v4l2.o tegracam_utils.o
 obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture_common.o
 obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += isp/isp_channel.o
 obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += isp/capture_isp.o
diff --git a/drivers/media/platform/tegra/camera/tegracam_core.c b/drivers/media/platform/tegra/camera/tegracam_core.c
index 5a17322ff..9df1c3ea4 100644
--- a/drivers/media/platform/tegra/camera/tegracam_core.c
+++ b/drivers/media/platform/tegra/camera/tegracam_core.c
@@ -22,7 +22,7 @@
 /* use semantic versioning convention */
 #define TEGRACAM_MAJOR_VERSION 2
 #define TEGRACAM_MINOR_VERSION 0
-#define TEGRACAM_PATCH_VERSION 1
+#define TEGRACAM_PATCH_VERSION 2
 
 u32 tegracam_version(u8 major, u8 minor, u8 patch)
 {
@@ -133,6 +133,7 @@ int tegracam_device_register(struct tegracam_device *tc_dev)
         /* add version info to identify the right feature set */
         tc_dev->version = tegracam_version(TEGRACAM_MAJOR_VERSION,
                         TEGRACAM_MINOR_VERSION, TEGRACAM_PATCH_VERSION);
+        s_data->version = tc_dev->version;
         dev_info(dev, "tegracam sensor driver:%s_v%d.%d.%d\n",
                         tc_dev->name, TEGRACAM_MAJOR_VERSION,
                         TEGRACAM_MINOR_VERSION, TEGRACAM_PATCH_VERSION);
diff --git a/drivers/media/platform/tegra/camera/tegracam_utils.c b/drivers/media/platform/tegra/camera/tegracam_utils.c
new file mode 100644
index 000000000..1339addcc
--- /dev/null
+++ b/drivers/media/platform/tegra/camera/tegracam_utils.c
@@ -0,0 +1,212 @@
+/*
+ * tegracam_utils - tegra camera framework utilities
+ *
+ * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/types.h>
+#include <linux/regmap.h>
+#include <media/tegracam_core.h>
+#include <media/tegracam_utils.h>
+
+bool is_tvcf_supported(u32 version)
+{
+        /* 2.0.0 is the base tvcf version sensor driver*/
+        return (version >= tegracam_version(2, 0, 0) ? true : false);
+}
+EXPORT_SYMBOL_GPL(is_tvcf_supported);
+
+void conv_u32_u8arr(u32 input, u8 *output)
+{
+        output[0] = (input >> 24) & 0xFF;
+        output[1] = (input >> 16) & 0xFF;
+        output[2] = (input >> 8) & 0xFF;
+        output[3] = input & 0xFF;
+}
+EXPORT_SYMBOL_GPL(conv_u32_u8arr);
+
+void conv_u16_u8arr(u16 input, u8 *output)
+{
+        output[0] = (input >> 8) & 0xFF;
+        output[1] = input & 0xFF;
+}
+EXPORT_SYMBOL_GPL(conv_u16_u8arr);
+
+static inline int is_valid_blob(struct sensor_blob *blob, u32 size)
+{
+        if (!blob)
+                return -EINVAL;
+
+        if ((blob->num_cmds >= MAX_COMMANDS) ||
+                ((blob->buf_size + size) >= MAX_BLOB_SIZE))
+                return -ENOMEM;
+
+        return 0;
+}
+
+int prepare_write_cmd(struct sensor_blob *blob,
+                        u32 size, u32 addr, u8 *buf)
+{
+        struct sensor_cmd *cmd = NULL;
+        int err = 0;
+
+        err = is_valid_blob(blob, size);
+        if (err)
+                return err;
+
+        cmd = &blob->cmds[blob->num_cmds++];
+        cmd->opcode = ((SENSOR_OPCODE_WRITE << 24) | size);
+        cmd->addr = addr;
+
+        memcpy(&blob->buf[blob->buf_size], buf, size);
+
+        blob->buf_size += size;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(prepare_write_cmd);
+
+int prepare_read_cmd(struct sensor_blob *blob,
+                        u32 size, u32 addr)
+{
+        struct sensor_cmd *cmd = NULL;
+        int err = 0;
+
+        err = is_valid_blob(blob, size);
+        if (err)
+                return err;
+
+        cmd = &blob->cmds[blob->num_cmds++];
+        cmd->opcode = ((SENSOR_OPCODE_READ << 24) | size);
+        cmd->addr = addr;
+
+        blob->buf_size += size;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(prepare_read_cmd);
+
+int prepare_sleep_cmd(struct sensor_blob *blob, u32 time_in_us)
+{
+        struct sensor_cmd *cmd = NULL;
+        int err = 0;
+
+        err = is_valid_blob(blob, 0);
+        if (err)
+                return err;
+
+        cmd = &blob->cmds[blob->num_cmds++];
+        cmd->opcode = (SENSOR_OPCODE_SLEEP << 24) | time_in_us;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(prepare_sleep_cmd);
+
+int prepare_done_cmd(struct sensor_blob *blob)
+{
+        struct sensor_cmd *cmd = NULL;
+        int err = 0;
+
+        err = is_valid_blob(blob, 0);
+        if (err)
+                return err;
+
+        cmd = &blob->cmds[blob->num_cmds++];
+        cmd->opcode = SENSOR_OPCODE_DONE;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(prepare_done_cmd);
+
+int convert_table_to_blob(struct sensor_blob *blob,
+                          const struct reg_8 table[],
+                          u16 wait_ms_addr, u16 end_addr)
+{
+        const struct reg_8 *next;
+        u16 addr;
+        u8 val;
+        int range_start = -1;
+        int range_count = 0;
+        u8 buf[16];
+
+        for (next = table;; next++) {
+                val = next->val;
+                addr = next->addr;
+                if (range_start == -1)
+                        range_start = next->addr;
+
+                if (range_count == 16 ||
+                        (addr != (range_start + range_count))) {
+                        /* write opcode and size for store index*/