nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 02:01:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

video: camera: Modify rtcpu modules for OOT tree

Browse Source 
This patch modifies rtcpu modules to use new ivc headers,
resolves cyclic dependencies between the modules,
reduces the amount of modules built by linking them together
and fixes other minor issues encountered with K5.15

Change-Id: I9cf2672df08ffe6c4b8aea9ac21d6cc50a92bb4e
Signed-off-by: Matti Ryttylainen <mryttylainen@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2787121
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Ankur Pawar <ankurp@nvidia.com>
Reviewed-by: Semi Malinen <smalinen@nvidia.com>
Reviewed-by: Pekka Pessi <ppessi@nvidia.com>
Reviewed-by: Frank Chen <frankc@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Matti Ryttylainen
2022-10-05 08:18:59 +03:00
committed by mobile promotions
parent 304123a3bf
commit dd109353df
13 changed files with 74 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/platform/tegra/rtcpu/camchar.c
View File

@@ -16,9 +16,9 @@
#include <linux/sched/signal.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/tegra-ivc.h>
#include <soc/tegra/ivc_ext.h>
#include <linux/tegra-ivc-bus.h>
#include <linux/tegra-ivc-instance.h>
#include <soc/tegra/ivc-priv.h>
#include <linux/wait.h>
#include <asm/ioctls.h>
#include <asm/uaccess.h>
@@ -113,7 +113,7 @@ static ssize_t tegra_camchar_read(struct file *fp, char __user *buffer, size_t l
break;
prepare_to_wait(&dev_data->waitq, &wait, TASK_INTERRUPTIBLE);
ret = tegra_ivc_read_user(&ch->ivc, buffer, len);
ret = tegra_ivc_read(&ch->ivc, buffer, NULL, len);
mutex_unlock(&dev_data->io_lock);
if (ret != -ENOMEM)
@@ -153,7 +153,7 @@ static ssize_t tegra_camchar_write(struct file *fp, const char __user *buffer,
break;
prepare_to_wait(&dev_data->waitq, &wait, TASK_INTERRUPTIBLE);
ret = tegra_ivc_write_user(&ch->ivc, buffer, len);
ret = tegra_ivc_write(&ch->ivc, buffer, NULL, len);
mutex_unlock(&dev_data->io_lock);
if (ret > 0)
@@ -200,7 +200,7 @@ static long tegra_camchar_ioctl(struct file *fp, unsigned int cmd,
break;
/* ioctls specific to this device */
case CCIOGNFRAMES:
val = ch->ivc.nframes;
val = ch->ivc.num_frames;
ret = put_user(val, (int __user *)arg);
break;
case CCIOGNBYTES:
@@ -385,6 +385,7 @@ static const struct of_device_id camchar_of_match[] = {
.data = (void *)"camchar-dbg", },
{ },
};
MODULE_DEVICE_TABLE(of, camchar_of_match);
static struct tegra_ivc_driver camchar_driver = {
.driver = {