From patchwork Mon Jan 18 17:19:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 43129 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8BD97B7C8D for ; Tue, 19 Jan 2010 04:30:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754894Ab0ARRUx (ORCPT ); Mon, 18 Jan 2010 12:20:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755248Ab0ARRUw (ORCPT ); Mon, 18 Jan 2010 12:20:52 -0500 Received: from mail-fx0-f225.google.com ([209.85.220.225]:57577 "EHLO mail-fx0-f225.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755224Ab0ARRUr (ORCPT ); Mon, 18 Jan 2010 12:20:47 -0500 Received: by mail-fx0-f225.google.com with SMTP id 25so682979fxm.21 for ; Mon, 18 Jan 2010 09:20:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=LJaQGuayYiokunhxWnjniU6/gorlEKgOAppoUb90W5o=; b=CiYzPbYvOl87Huhff+J4+/Br37+k9HIctU6LnVOU0e+GYmvFnD90l0DYQ7ULxkawm8 Fm3Rc9rcT+MXvQ22tzhPVeiInB96CokUlvWU3tfjrK5TPy/01O6uGNSURdsEFhn2p96v cSMkkZNmVwVuUDu4RUH2EKtukAYatmx1mEY5c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=h/CyLTS36J26hRcXw8DvwSOAS42dDCpeOHDRWPVZ7Yw5m5y+BddrEda5QWUmrZzNfm fDjkONasp7KbyW/6GbABSjjLq6jRHjdkNXIlQtt7Uan467IpiMJRembtVY41ccNrJ6ZI QowA5sUbKE70K+iIH5rhF13UslUaODLX+hSwk= Received: by 10.216.88.21 with SMTP id z21mr1406071wee.60.1263835246197; Mon, 18 Jan 2010 09:20:46 -0800 (PST) Received: from ?127.0.0.1? (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id g9sm4991910gvc.10.2010.01.18.09.20.45 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 18 Jan 2010 09:20:45 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Mon, 18 Jan 2010 18:19:37 +0100 Message-Id: <20100118171937.14623.67352.sendpatchset@localhost> In-Reply-To: <20100118171349.14623.90030.sendpatchset@localhost> References: <20100118171349.14623.90030.sendpatchset@localhost> Subject: [PATCH 39/64] via82cxxx: vx855 is a single channel controller Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] via82cxxx: vx855 is a single channel controller Based on commit e4d866c for pata_via host driver (PCI ID was later changed by commit 5993856). Update my credits while at it. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/via82cxxx.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: b/drivers/ide/via82cxxx.c =================================================================== --- a/drivers/ide/via82cxxx.c +++ b/drivers/ide/via82cxxx.c @@ -6,7 +6,7 @@ * vt8235, vt8237, vt8237a * * Copyright (c) 2000-2002 Vojtech Pavlik - * Copyright (c) 2007 Bartlomiej Zolnierkiewicz + * Copyright (c) 2007-2010 Bartlomiej Zolnierkiewicz * * Based on the work of: * Michel Aubry @@ -55,6 +55,10 @@ #define VIA_BAD_ID 0x10 /* Has wrong vendor ID (0x1107) */ #define VIA_BAD_AST 0x20 /* Don't touch Address Setup Timing */ +enum { + VIA_IDFLAG_SINGLE = (1 << 1), /* single channel controller */ +}; + /* * VIA SouthBridge chips. */ @@ -436,10 +440,13 @@ static int __devinit via_init_one(struct via_clock = 33333; } - if (idx == 0) - d.host_flags |= IDE_HFLAG_NO_AUTODMA; - else + if (idx == 1) d.enablebits[1].reg = d.enablebits[0].reg = 0; + else + d.host_flags |= IDE_HFLAG_NO_AUTODMA; + + if (idx == VIA_IDFLAG_SINGLE) + d.host_flags |= IDE_HFLAG_SINGLE; if ((via_config->flags & VIA_NO_UNMASK) == 0) d.host_flags |= IDE_HFLAG_UNMASK_IRQS; @@ -475,7 +482,7 @@ static const struct pci_device_id via_pc { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C576_1), 0 }, { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C586_1), 0 }, { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_CX700_IDE), 0 }, - { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_VX855_IDE), 0 }, + { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_VX855_IDE), VIA_IDFLAG_SINGLE }, { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_6410), 1 }, { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_SATA_EIDE), 1 }, { 0, }, @@ -504,6 +511,6 @@ static void __exit via_ide_exit(void) module_init(via_ide_init); module_exit(via_ide_exit); -MODULE_AUTHOR("Vojtech Pavlik, Michel Aubry, Jeff Garzik, Andre Hedrick"); +MODULE_AUTHOR("Vojtech Pavlik, Bartlomiej Zolnierkiewicz, Michel Aubry, Jeff Garzik, Andre Hedrick"); MODULE_DESCRIPTION("PCI driver module for VIA IDE"); MODULE_LICENSE("GPL");