From patchwork Wed Jan 29 09:50:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Bugge X-Patchwork-Id: 3550481 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C0B919F381 for ; Wed, 29 Jan 2014 09:50:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5B04200F0 for ; Wed, 29 Jan 2014 09:50:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CEF8A200E9 for ; Wed, 29 Jan 2014 09:50:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751138AbaA2Juf (ORCPT ); Wed, 29 Jan 2014 04:50:35 -0500 Received: from aer-iport-2.cisco.com ([173.38.203.52]:30314 "EHLO aer-iport-2.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750901AbaA2Juc (ORCPT ); Wed, 29 Jan 2014 04:50:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=880; q=dns/txt; s=iport; t=1390989031; x=1392198631; h=from:to:cc:subject:date:message-id; bh=xe9jc71ffKVtClWKg4yTE0RE9zbPofIO7duwKWpHTSM=; b=LeJj7+jizPNVeVWeDOB5d5EGdm6kwWcz5+jgmEJwGxr00Bu0lPZTXitv xrg9GAAzMuebfL6ry43N/CdrRF8kkmQkfkuib87oLnKyunQDaz0k4yJ2O WyEpCC14IppU3EGoMWk6GRPe7MAdy+4s4CrTBoRmjHe4lPHV43yVYS67y I=; X-IronPort-AV: E=Sophos;i="4.95,741,1384300800"; d="scan'208";a="3677577" Received: from ams-core-3.cisco.com ([144.254.72.76]) by aer-iport-2.cisco.com with ESMTP; 29 Jan 2014 09:50:30 +0000 Received: from mbuggepc.cisco.com ([10.47.19.183]) by ams-core-3.cisco.com (8.14.5/8.14.5) with ESMTP id s0T9oU4Z027055; Wed, 29 Jan 2014 09:50:30 GMT From: Martin Bugge To: linux-media@vger.kernel.org Cc: Martin Bugge , Hans Verkuil Subject: [PATCH] [media] adv7842: Composite free-run platfrom-data fix Date: Wed, 29 Jan 2014 10:50:20 +0100 Message-Id: <1390989020-14444-1-git-send-email-marbugge@cisco.com> X-Mailer: git-send-email 1.8.1.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-15.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Incorrectly setting of free-run for Composite. Copy/paste regression fix. Should go to kernel 3.14. Cc: Hans Verkuil Signed-off-by: Martin Bugge --- drivers/media/i2c/adv7842.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index 1effc21..9bbd665 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c @@ -2554,7 +2554,7 @@ static int adv7842_core_init(struct v4l2_subdev *sd) sdp_write_and_or(sd, 0xdd, 0xf0, pdata->sdp_free_run_force | (pdata->sdp_free_run_cbar_en << 1) | (pdata->sdp_free_run_man_col_en << 2) | - (pdata->sdp_free_run_force << 3)); + (pdata->sdp_free_run_auto << 3)); /* TODO from platform data */ cp_write(sd, 0x69, 0x14); /* Enable CP CSC */