diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2016-08-26 20:17:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-06-06 09:58:16 -0300 |
| commit | 859969b38e2e9352f0227e1ef0be1dff4a3b7299 (patch) | |
| tree | 694b94a4bb36b24f84ebe2f16620e8b18b374433 /include/media | |
| parent | 048ea05b4f4c8f8cf0a9d4c5fc7d16f867160764 (diff) | |
| download | linux-859969b38e2e9352f0227e1ef0be1dff4a3b7299.tar.gz linux-859969b38e2e9352f0227e1ef0be1dff4a3b7299.tar.bz2 linux-859969b38e2e9352f0227e1ef0be1dff4a3b7299.zip | |
[media] v4l: Switch from V4L2 OF not V4L2 fwnode API
Switch users of the v4l2_of_ APIs to the more generic v4l2_fwnode_ APIs.
Async OF matching is replaced by fwnode matching and OF matching support
is removed.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Benoit Parrot <bparrot@ti.com> # i2c/ov2569.c, am437x/am437x-vpfe.c and ti-vpe/cal.c
Tested-by: Hans Verkuil <hans.verkuil@cisco.com> # Atmel sama5d3 board + ov2640 sensor
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/v4l2-async.h | 5 | ||||
| -rw-r--r-- | include/media/v4l2-subdev.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h index c3695fa2c903..c69d8c8a66d0 100644 --- a/include/media/v4l2-async.h +++ b/include/media/v4l2-async.h @@ -31,7 +31,6 @@ struct v4l2_async_notifier; * v4l2_async_subdev.match ops * @V4L2_ASYNC_MATCH_DEVNAME: Match will use the device name * @V4L2_ASYNC_MATCH_I2C: Match will check for I2C adapter ID and address - * @V4L2_ASYNC_MATCH_OF: Match will use OF node * @V4L2_ASYNC_MATCH_FWNODE: Match will use firmware node * * This enum is used by the asyncrhronous sub-device logic to define the @@ -41,7 +40,6 @@ enum v4l2_async_match_type { V4L2_ASYNC_MATCH_CUSTOM, V4L2_ASYNC_MATCH_DEVNAME, V4L2_ASYNC_MATCH_I2C, - V4L2_ASYNC_MATCH_OF, V4L2_ASYNC_MATCH_FWNODE, }; @@ -57,9 +55,6 @@ struct v4l2_async_subdev { enum v4l2_async_match_type match_type; union { struct { - const struct device_node *node; - } of; - struct { struct fwnode_handle *fwnode; } fwnode; struct { diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 5f1669c45642..a40760174797 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -787,7 +787,6 @@ struct v4l2_subdev_platform_data { * is attached. * @devnode: subdev device node * @dev: pointer to the physical device, if any - * @of_node: The device_node of the subdev, usually the same as dev->of_node. * @fwnode: The fwnode_handle of the subdev, usually the same as * either dev->of_node->fwnode or dev->fwnode (whichever is non-NULL). * @async_list: Links this subdev to a global subdev_list or @notifier->done @@ -820,7 +819,6 @@ struct v4l2_subdev { void *host_priv; struct video_device *devnode; struct device *dev; - struct device_node *of_node; struct fwnode_handle *fwnode; struct list_head async_list; struct v4l2_async_subdev *asd; |