nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

media: Replacing v4l2_async_subdev to v4l2_async_connection for Linux6.6

Browse Source 
The API v4l2_async_subdev is replaced by v4l2_async_connection in Linux 6.6
with below kernel change:
----
commit adb2dcd5f2d49d3ba3171160fabd4be0d4b2a86c
Author: Sakari Ailus <sakari.ailus@linux.intel.com>
Date:   Thu Feb 16 14:54:53 2023 +0100

    media: v4l: async: Rename v4l2_async_subdev as v4l2_async_connection
----

Using the new API.

Bug 4346767

Change-Id: I73c39fd499a0a5cbeb8d3f24de08c52a5ea8dda5
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3008085
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Laxman Dewangan
2023-11-01 04:30:10 +00:00
committed by mobile promotions
parent 6d944beefd
commit 08a1772814
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -37,6 +37,9 @@ subdir-ccflags-y += -DNV_I2C_LEGACY_PROBE_NEW_REMOVED
# API changes to replace u8 with unsigned char # API changes to replace u8 with unsigned char
subdir-ccflags-y += -DNV_TTY_SERIAL_TYPE_U8_CHANGE subdir-ccflags-y += -DNV_TTY_SERIAL_TYPE_U8_CHANGE
# v4l2_async_subdev is renamed to v4l2_async_connection.
subdir-ccflags-y += -DNV_V4L2_ASYNC_SUBDEV_RENAME
endif endif
ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y) ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)

12
drivers/media/platform/tegra/camera/vi/graph.c
View File

@@ -341,9 +341,15 @@ register_device_error:
return ret; return ret;
} }
#if defined(NV_V4L2_ASYNC_SUBDEV_RENAME)
static int tegra_vi_graph_notify_bound(struct v4l2_async_notifier *notifier,
struct v4l2_subdev *subdev,
struct v4l2_async_connection *asd)
#else
static int tegra_vi_graph_notify_bound(struct v4l2_async_notifier *notifier, static int tegra_vi_graph_notify_bound(struct v4l2_async_notifier *notifier,
struct v4l2_subdev *subdev, struct v4l2_subdev *subdev,
struct v4l2_async_subdev *asd) struct v4l2_async_subdev *asd)
#endif
{ {
struct tegra_channel *chan = struct tegra_channel *chan =
container_of(notifier, struct tegra_channel, notifier); container_of(notifier, struct tegra_channel, notifier);
@@ -374,9 +380,15 @@ static int tegra_vi_graph_notify_bound(struct v4l2_async_notifier *notifier,
return -EINVAL; return -EINVAL;
} }
#if defined(NV_V4L2_ASYNC_SUBDEV_RENAME)
static void tegra_vi_graph_notify_unbind(struct v4l2_async_notifier *notifier,
struct v4l2_subdev *subdev,
struct v4l2_async_connection *asd)
#else
static void tegra_vi_graph_notify_unbind(struct v4l2_async_notifier *notifier, static void tegra_vi_graph_notify_unbind(struct v4l2_async_notifier *notifier,
struct v4l2_subdev *subdev, struct v4l2_subdev *subdev,
struct v4l2_async_subdev *asd) struct v4l2_async_subdev *asd)
#endif
{ {
struct tegra_channel *chan = struct tegra_channel *chan =
container_of(notifier, struct tegra_channel, notifier); container_of(notifier, struct tegra_channel, notifier);

4
include/media/mc_common.h
View File

@@ -94,7 +94,11 @@ struct tegra_vi_graph_entity {
struct device_node *node; struct device_node *node;
struct media_entity *entity; struct media_entity *entity;
#if defined(NV_V4L2_ASYNC_SUBDEV_RENAME)
struct v4l2_async_connection asd;
#else
struct v4l2_async_subdev asd; struct v4l2_async_subdev asd;
#endif
struct v4l2_subdev *subdev; struct v4l2_subdev *subdev;
}; };