From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Fri, 9 Sep 2016 14:40:42 +0000 (-0300)
Subject: Merge branch 'patchwork' into to_next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f01e45f657a2f473fecf85c80f156a8bc0c3b31d;p=deliverable%2Flinux.git

Merge branch 'patchwork' into to_next

* patchwork: (390 commits)
  [media] v4l: vsp1: Add R8A7792 VSP1V support
  [media] v4l: vsp1: Fix tri-planar format support through DRM API
  [media] v4l: vsp1: Report device model and rev through media device information
  [media] v4l: rcar-fcp: Extend compatible list to support the FDP
  [media] v4l: rcar-fcp: Don't force users to check for disabled FCP support
  [media] v4l: rcar-fcp: Keep the coding style consistent
  [media] v4l: ioctl: Clear the v4l2_pix_format_mplane reserved field
  [media] dt-bindings: Document Renesas R-Car FCP power-domains usage
  [media] dt-bindings: Update Renesas R-Car FCP DT bindings for FCPF
  [media] ad5820: Use bool for boolean values
  [media] media: Move media_device link_notify operation to an ops structure
  [media] smiapp: Add support for 14 and 16 bits per sample depths
  [media] media: Add 1X16 16-bit raw bayer media bus code definitions
  [media] media: Add 1X14 14-bit raw bayer media bus code definitions
  [media] doc-rst: 16-bit BGGR is always 16 bits
  [media] doc-rst: Unify documentation of the 8-bit bayer formats
  [media] doc-rst: Clean up raw bayer pixel format definitions
  [media] doc-rst: Fix number of zeroed high order bits in 12-bit raw format defs
  [media] doc-rst: Correct the ordering of LSBs of the 10-bit raw packed formats
  [media] pxa_camera: remove an unused structure pointer
  ...
---

f01e45f657a2f473fecf85c80f156a8bc0c3b31d
diff --cc Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
index 201d4839931c,6c314c2db73e..940a16d8d55e
--- a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
@@@ -201,25 -206,8 +206,27 @@@ logical address types are already defin
            give the CEC framework more information about the device type, even
            though the framework won't use it directly in the CEC message.
  
 +.. _cec-log-addrs-flags:
 +
 +.. flat-table:: Flags for struct cec_log_addrs
 +    :header-rows:  0
 +    :stub-columns: 0
 +    :widths:       3 1 4
 +
 +
 +    -  .. _`CEC-LOG-ADDRS-FL-ALLOW-UNREG-FALLBACK`:
 +
 +       -  ``CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK``
 +
 +       -  1
 +
 +       -  By default if no logical address of the requested type can be claimed, then
 +	  it will go back to the unconfigured state. If this flag is set, then it will
 +	  fallback to the Unregistered logical address. Note that if the Unregistered
 +	  logical address was explicitly requested, then this flag has no effect.
 +
+ .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
+ 
  .. _cec-versions:
  
  .. flat-table:: CEC Versions
diff --cc Documentation/media/uapi/cec/cec-ioc-dqevent.rst
index 2e1e73928396,060c455380ce..a9d7146e34dd
--- a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
@@@ -73,14 -73,12 +74,15 @@@ it is guaranteed that the state did cha
  
         -  ``log_addr_mask``
  
 -       -  The current set of claimed logical addresses.
 +       -  The current set of claimed logical addresses. This is 0 if no logical
 +          addresses are claimed or if ``phys_addr`` is ``CEC_PHYS_ADDR_INVALID``.
 +	  If bit 15 is set (``1 << CEC_LOG_ADDR_UNREGISTERED``) then this device
 +	  has the unregistered logical address. In that case all other bits are 0.
  
  
+ .. tabularcolumns:: |p{1.0cm}|p{2.0cm}|p{14.5cm}|
  
- .. _cec-event-lost-msgs_s:
+ .. c:type:: cec_event_lost_msgs
  
  .. flat-table:: struct cec_event_lost_msgs
      :header-rows:  0