From patchwork Wed Jul 3 23:27:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jon_Arne_J=C3=B8rgensen?= X-Patchwork-Id: 2820871 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 85D32BF4A1 for ; Wed, 3 Jul 2013 23:26:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ACC06201DD for ; Wed, 3 Jul 2013 23:26:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBC69201CB for ; Wed, 3 Jul 2013 23:25:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933361Ab3GCXYn (ORCPT ); Wed, 3 Jul 2013 19:24:43 -0400 Received: from cm-84.215.157.11.getinternet.no ([84.215.157.11]:54225 "EHLO server.arpanet.local" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933096Ab3GCXYm (ORCPT ); Wed, 3 Jul 2013 19:24:42 -0400 Received: from dell.arpanet.local (unknown [172.27.27.20]) by server.arpanet.local (Postfix) with ESMTP id D7A571609A; Thu, 4 Jul 2013 01:21:27 +0200 (CEST) Received: by dell.arpanet.local (Postfix, from userid 1000) id 307F0300786; Thu, 4 Jul 2013 01:27:21 +0200 (CEST) From: =?UTF-8?q?Jon=20Arne=20J=C3=B8rgensen?= To: linux-media@vger.kernel.org Cc: jonarne@jonarne.no, linux-kernel@vger.kernel.org, mchehab@redhat.com, hans.verkuil@cisco.com, prabhakar.csengg@gmail.com, laurent.pinchart@ideasonboard.com, andriy.shevchenko@linux.intel.com Subject: [RFC v3 2/3] saa7115: Do not load saa7115_init_misc for gm7113c Date: Thu, 4 Jul 2013 01:27:19 +0200 Message-Id: <1372894040-23922-3-git-send-email-jonarne@jonarne.no> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1372894040-23922-1-git-send-email-jonarne@jonarne.no> References: <1372894040-23922-1-git-send-email-jonarne@jonarne.no> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY 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 Most of the registers changed in saa7115_init_misc table are out of range for the gm7113c chip. The only register that's within range doesn't need to be changed here. Signed-off-by: Jon Arne Jørgensen --- drivers/media/i2c/saa7115.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c index 41408dd..17a464d 100644 --- a/drivers/media/i2c/saa7115.c +++ b/drivers/media/i2c/saa7115.c @@ -1769,7 +1769,7 @@ static int saa711x_probe(struct i2c_client *client, state->crystal_freq = SAA7115_FREQ_32_11_MHZ; saa711x_writeregs(sd, saa7115_init_auto_input); } - if (state->ident > SAA7111A) + if (state->ident > SAA7111A && state->ident != GM7113C) saa711x_writeregs(sd, saa7115_init_misc); saa711x_set_v4lstd(sd, V4L2_STD_NTSC); v4l2_ctrl_handler_setup(hdl);