From patchwork Tue Jul 12 14:39:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hans Verkuil (hansverk)" X-Patchwork-Id: 9225511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AB9016086B for ; Tue, 12 Jul 2016 14:39:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CAB627BFA for ; Tue, 12 Jul 2016 14:39:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90D1927D29; Tue, 12 Jul 2016 14:39:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FE1627BFA for ; Tue, 12 Jul 2016 14:39:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030387AbcGLOjm (ORCPT ); Tue, 12 Jul 2016 10:39:42 -0400 Received: from aer-iport-1.cisco.com ([173.38.203.51]:57119 "EHLO aer-iport-1.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030298AbcGLOjk (ORCPT ); Tue, 12 Jul 2016 10:39:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1239; q=dns/txt; s=iport; t=1468334380; x=1469543980; h=to:from:subject:message-id:date:mime-version: content-transfer-encoding; bh=GrY+2wteaSURDhvoh6QjGqrlpmnAF2crFdU8LgTmSII=; b=EBwo4PjQTpHLv47neHpoqlqTiEna5mVT3LUsGVVfiacY4F6ya4rInvKU eMrYR9Aa4gbfll7F874GKkVMrjKrIEsPZn84GxytcHMeIa00sUOJOfrR7 7euKKTyZPVhSUES9YFeb2fqf2m1rUudwThit4f02KPqZPgESxA7/fC3GS w=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0DNAQAnAIVX/xbLJq1chRC5CYF5iAYUA?= =?us-ascii?q?QEBAQEBAWUnhQZVNgIFFgsCCwMCAQIBSw0GAgKILKERj2KOWAEBCAIBJIEBhSm?= =?us-ascii?q?MD4I9HQEEk12FPo5UiU6FYJAUHjaDczoyiSUBAQE?= X-IronPort-AV: E=Sophos;i="5.28,352,1464652800"; d="scan'208";a="678225154" Received: from aer-iport-nat.cisco.com (HELO aer-core-2.cisco.com) ([173.38.203.22]) by aer-iport-1.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jul 2016 14:39:38 +0000 Received: from [10.47.79.81] ([10.47.79.81]) (authenticated bits=0) by aer-core-2.cisco.com (8.14.5/8.14.5) with ESMTP id u6CEdb81008092 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Tue, 12 Jul 2016 14:39:38 GMT To: linux-media From: Hans Verkuil Subject: vidioc-g-dv-timings.rst: document interlaced defines Message-ID: <57850129.9070606@cisco.com> Date: Tue, 12 Jul 2016 16:39:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.5.0 MIME-Version: 1.0 X-Authenticated-User: hansverk Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix missing references. Signed-off-by: Hans Verkuil --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst index e19d64e..f7bf21f 100644 --- a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst +++ b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst @@ -100,7 +100,7 @@ EBUSY - ``interlaced`` - - Progressive (0) or interlaced (1) + - Progressive (``V4L2_DV_PROGRESSIVE``) or interlaced (``V4L2_DV_INTERLACED``). - .. row 4 diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions index c15660f..b9be796 100644 --- a/Documentation/media/videodev2.h.rst.exceptions +++ b/Documentation/media/videodev2.h.rst.exceptions @@ -280,8 +280,8 @@ replace define V4L2_STD_ALL v4l2-std-id # V4L2 DT BT timings definitions -replace define V4L2_DV_PROGRESSIVE v4l2-dv-fixme -replace define V4L2_DV_INTERLACED v4l2-dv-fixme +replace define V4L2_DV_PROGRESSIVE v4l2-bt-timings +replace define V4L2_DV_INTERLACED v4l2-bt-timings replace define V4L2_DV_VSYNC_POS_POL v4l2-bt-timings replace define V4L2_DV_HSYNC_POS_POL v4l2-bt-timings