a47279154e
Manually rebased patches:
bcm27xx:
patches-5.4/950-0267-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
bcm53xx:
patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
layerscape:
patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
patches-5.4/808-i2c-0002-MLK-10893-i2c-imx-add-irqf_no_suspend.patch
patches-5.4/820-usb-0016-MLK-16735-usb-host-add-XHCI_CDNS_HOST-flag.patch
Removed since could be reverse-applied by quilt:
mediatek:
patches-5.4/0700-arm-dts-mt7623-add-missing-pause-for-switchport.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, x86_64
Run-tested: ipq806x/R7800, x86_64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-by: Curtis Deptuck <curtdept@me.com> [x86_64]
Rebase of 802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
85 lines
3.6 KiB
Diff
85 lines
3.6 KiB
Diff
From 09f5e82f292a900d17a5205e54a35e24296bd9f7 Mon Sep 17 00:00:00 2001
|
|
From: Naushir Patuck <naush@raspberrypi.com>
|
|
Date: Wed, 1 Apr 2020 08:46:29 +0100
|
|
Subject: [PATCH] media: uapi: v4l2-core: Add sensor ancillary data
|
|
V4L2 foucc type.
|
|
|
|
Add V4L2_META_FMT_SENSOR_DATA format 4CC.
|
|
|
|
This new format will be used by the BCM2835 Unicam device to return
|
|
out camera sensor embedded data.
|
|
|
|
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
|
|
---
|
|
Documentation/media/uapi/v4l/meta-formats.rst | 1 +
|
|
.../uapi/v4l/pixfmt-meta-sensor-data.rst | 32 +++++++++++++++++++
|
|
drivers/media/v4l2-core/v4l2-ioctl.c | 1 +
|
|
include/uapi/linux/videodev2.h | 1 +
|
|
4 files changed, 35 insertions(+)
|
|
create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst
|
|
|
|
--- a/Documentation/media/uapi/v4l/meta-formats.rst
|
|
+++ b/Documentation/media/uapi/v4l/meta-formats.rst
|
|
@@ -21,6 +21,7 @@ These formats are used for the :ref:`met
|
|
|
|
pixfmt-meta-d4xx
|
|
pixfmt-meta-intel-ipu3
|
|
+ pixfmt-meta-sensor-data
|
|
pixfmt-meta-uvc
|
|
pixfmt-meta-vsp1-hgo
|
|
pixfmt-meta-vsp1-hgt
|
|
--- /dev/null
|
|
+++ b/Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst
|
|
@@ -0,0 +1,32 @@
|
|
+.. Permission is granted to copy, distribute and/or modify this
|
|
+.. document under the terms of the GNU Free Documentation License,
|
|
+.. Version 1.1 or any later version published by the Free Software
|
|
+.. Foundation, with no Invariant Sections, no Front-Cover Texts
|
|
+.. and no Back-Cover Texts. A copy of the license is included at
|
|
+.. Documentation/media/uapi/fdl-appendix.rst.
|
|
+..
|
|
+.. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
|
|
+
|
|
+.. _v4l2-meta-fmt-sensor-data:
|
|
+
|
|
+***********************************
|
|
+V4L2_META_FMT_SENSOR_DATA ('SENS')
|
|
+***********************************
|
|
+
|
|
+Sensor Ancillary Metadata
|
|
+
|
|
+Description
|
|
+===========
|
|
+
|
|
+This format describes ancillary data generated by a camera sensor and
|
|
+transmitted over a stream on the camera bus. Sensor vendors generally have their
|
|
+own custom format for this ancillary data. Some vendors follow a generic
|
|
+CSI-2/SMIA embedded data format as described in the `CSI-2 specification.
|
|
+<https://mipi.org/specifications/csi-2>`_
|
|
+
|
|
+The size of the embedded buffer is defined as a single line with a pixel width
|
|
+width specified in bytes. This is obtained by a call to the
|
|
+:c:type:`VIDIOC_SUBDEV_G_FMT` ioctl on the sensor subdevice where the ``pad``
|
|
+field in :c:type:`v4l2_subdev_format` is set to 1. Note that this size is fixed
|
|
+and cannot be modified with a call to :c:type:`VIDIOC_SUBDEV_S_FMT`.
|
|
+
|
|
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
@@ -1332,6 +1332,7 @@ static void v4l_fill_fmtdesc(struct v4l2
|
|
case V4L2_META_FMT_VSP1_HGT: descr = "R-Car VSP1 2-D Histogram"; break;
|
|
case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break;
|
|
case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break;
|
|
+ case V4L2_META_FMT_SENSOR_DATA: descr = "Sensor Ancillary Metadata"; break;
|
|
|
|
default:
|
|
/* Compressed formats */
|
|
--- a/include/uapi/linux/videodev2.h
|
|
+++ b/include/uapi/linux/videodev2.h
|
|
@@ -768,6 +768,7 @@ struct v4l2_pix_format {
|
|
#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T') /* R-Car VSP1 2-D Histogram */
|
|
#define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H') /* UVC Payload Header metadata */
|
|
#define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X') /* D4XX Payload Header metadata */
|
|
+#define V4L2_META_FMT_SENSOR_DATA v4l2_fourcc('S', 'E', 'N', 'S') /* Sensor Ancillary metadata */
|
|
|
|
/* priv field value to indicates that subsequent fields are valid. */
|
|
#define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
|