From patchwork Sat Mar 23 22:28:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volokh Konstantin X-Patchwork-Id: 2325301 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id EDC0C3FC8A for ; Sat, 23 Mar 2013 22:36:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752219Ab3CWWgB (ORCPT ); Sat, 23 Mar 2013 18:36:01 -0400 Received: from mail-la0-f53.google.com ([209.85.215.53]:44265 "EHLO mail-la0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752184Ab3CWWgA (ORCPT ); Sat, 23 Mar 2013 18:36:00 -0400 Received: by mail-la0-f53.google.com with SMTP id fr10so9245168lab.40 for ; Sat, 23 Mar 2013 15:35:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=S2i49xDMol/i1oWUX8xjkHcrVhQdlVjyhFw1PPbB0D0=; b=pAHS9Ioq6EUiLq/55tYiy0yqVc3zgRWSJqsWdRADyuW2HXr+5TSr8QNWY4MYlRfJLj FZyr9TW+SUTQDa+DpFHN3rZCpcoedSCMnCDattR3UubJvUPHkB+l0GD9oNUD4KvogJb2 eslPlFyMIZF59RcVjMMRaCIkrLhoMBAsikq7veNMcyTQW8DoVN7iCVH9wSLWa6jaMpqo kJvQNa6LaxmXgHCcvZkKBT1khKhXSAZfQRdULMY7tnhHdieGJDUN5xXEy3YnYkbOHRRO WMtKa0vE9FhQ5HOUqrOFgvAjsCw1vcGtoEjOkQ0icrCVkojeN6z2bpFuS86+lRZpJceZ i+ww== X-Received: by 10.152.147.130 with SMTP id tk2mr3382134lab.24.1364078159136; Sat, 23 Mar 2013 15:35:59 -0700 (PDT) Received: from Volokh.Home (host-196-158-66-217.spbmts.ru. [217.66.158.196]) by mx.google.com with ESMTPS id hk10sm2828010lab.4.2013.03.23.15.35.57 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 23 Mar 2013 15:35:58 -0700 (PDT) From: Volokh Konstantin To: hverkuil@xs4all.nl, linux-media@vger.kernel.org Cc: Volokh Konstantin Subject: [PATCH] hverkuil/go7007: media: i2c : tw2804: Revert ADC Control Reverting patch commit 3d321ebba68f1fc50a9461373e8da0887e39fbbc Case: In AdLink MPG24 there is bt878 exists (it captures one frame of all video inputs), Video Signal for it one transmits through tw2804 chip, so we can`t control ADC (shut on/off) on tw2804 , as some another can use bttv capture way. Date: Sun, 24 Mar 2013 02:28:28 +0400 Message-Id: <1364077708-508-1-git-send-email-volokh84@gmail.com> X-Mailer: git-send-email 1.7.7.6 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: Volokh Konstantin --- drivers/media/i2c/tw2804.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/drivers/media/i2c/tw2804.c b/drivers/media/i2c/tw2804.c index 441b766..c5dc2c3 100644 --- a/drivers/media/i2c/tw2804.c +++ b/drivers/media/i2c/tw2804.c @@ -53,7 +53,7 @@ static const u8 global_registers[] = { 0x3d, 0x80, 0x3e, 0x82, 0x3f, 0x82, - 0x78, 0x0f, + 0x78, 0x00, 0xff, 0xff, /* Terminator (reg 0xff does not exist) */ }; @@ -337,20 +337,6 @@ static int tw2804_s_video_routing(struct v4l2_subdev *sd, u32 input, u32 output, return 0; } -static int tw2804_s_stream(struct v4l2_subdev *sd, int enable) -{ - struct tw2804 *dec = to_state(sd); - struct i2c_client *client = v4l2_get_subdevdata(sd); - u32 reg = read_reg(client, 0x78, 0); - - if (enable == 1) - write_reg(client, 0x78, reg & ~(1 << dec->channel), 0); - else - write_reg(client, 0x78, reg | (1 << dec->channel), 0); - - return 0; -} - static const struct v4l2_ctrl_ops tw2804_ctrl_ops = { .g_volatile_ctrl = tw2804_g_volatile_ctrl, .s_ctrl = tw2804_s_ctrl, @@ -358,7 +344,6 @@ static const struct v4l2_ctrl_ops tw2804_ctrl_ops = { static const struct v4l2_subdev_video_ops tw2804_video_ops = { .s_routing = tw2804_s_video_routing, - .s_stream = tw2804_s_stream, }; static const struct v4l2_subdev_core_ops tw2804_core_ops = {