From patchwork Sun Jan 2 12:07:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Igor M. Liplianin" X-Patchwork-Id: 446171 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p02CgmSe001542 for ; Sun, 2 Jan 2011 12:43:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754500Ab1ABMls (ORCPT ); Sun, 2 Jan 2011 07:41:48 -0500 Received: from mail-ew0-f66.google.com ([209.85.215.66]:36443 "EHLO mail-ew0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753863Ab1ABMkf (ORCPT ); Sun, 2 Jan 2011 07:40:35 -0500 Received: by ewy24 with SMTP id 24so1989719ewy.1 for ; Sun, 02 Jan 2011 04:40:33 -0800 (PST) Received: by 10.213.27.68 with SMTP id h4mr14858104ebc.10.1293972033631; Sun, 02 Jan 2011 04:40:33 -0800 (PST) Received: from useri.localnet ([93.125.74.3]) by mx.google.com with ESMTPS id b52sm13899177eei.7.2011.01.02.04.40.32 (version=SSLv3 cipher=RC4-MD5); Sun, 02 Jan 2011 04:40:32 -0800 (PST) Message-ID: <4d207240.cc7e0e0a.6f59.3765@mx.google.com> From: "Igor M. Liplianin" Date: Sun, 2 Jan 2011 14:07:00 +0200 Subject: [PATCH 8/9 v2] cx23885: disable MSI for NetUP cards, otherwise CI is not working To: , , Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 02 Jan 2011 12:43:54 +0000 (UTC) diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index 3a09dd2..e6d7232 100644 --- a/drivers/media/video/cx23885/cx23885-core.c +++ b/drivers/media/video/cx23885/cx23885-core.c @@ -1039,6 +1039,10 @@ static int cx23885_dev_setup(struct cx23885_dev *dev) cx23885_dev_checkrevision(dev); + /* disable MSI for NetUP cards, otherwise CI is not working */ + if (cx23885_boards[dev->board].ci_type > 0) + cx_clear(RDR_RDRCTL1, 1 << 8); + return 0; } diff --git a/drivers/media/video/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h index a28772d..c87ac68 100644 --- a/drivers/media/video/cx23885/cx23885-reg.h +++ b/drivers/media/video/cx23885/cx23885-reg.h @@ -292,6 +292,7 @@ Channel manager Data Structure entry = 20 DWORD #define RDR_CFG0 0x00050000 #define RDR_CFG1 0x00050004 #define RDR_CFG2 0x00050008 +#define RDR_RDRCTL1 0x0005030c #define RDR_TLCTL0 0x00050318 /* APB DMAC Current Buffer Pointer */