All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ben Collins <bcollins@ubuntu.com>
To: linux-kernel@vger.kernel.org
Cc: Ben Collins <bcollins@ubuntu.com>
Subject: [PATCH 2/2] ide/sis5513: Add support for 965 chipset
Date: Tue, 13 Dec 2005 13:24:14 -0500	[thread overview]
Message-ID: <1134498254295-git-send-email-bcollins@ubuntu.com> (raw)
In-Reply-To: <1134498192250-git-send-email-bcollins@ubuntu.com>

Tested by Ubuntu user.

http://bugzilla.ubuntu.com/17236

Signed-off-by: Ben Collins <bcollins@ubuntu.com>

---

 drivers/ide/pci/sis5513.c |    8 +++++++-
 include/linux/pci_ids.h   |    1 +
 2 files changed, 8 insertions(+), 1 deletions(-)

applies-to: a3b21d3b4c1fc36a94b3ffd9e722254ea2a8a950
3f0c8c36457e8f67471e1d0432f8cc1c5a6bedac
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 75a2253..c838648 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -766,7 +766,7 @@ static unsigned int __devinit init_chips
 			pci_read_config_word(dev, PCI_DEVICE_ID, &trueid);
 			pci_write_config_dword(dev, 0x54, idemisc);
 
-			if (trueid == 0x5518) {
+			if (trueid == PCI_DEVICE_ID_SI_5518) {
 				printk(KERN_INFO "SIS5513: SiS 962/963 MuTIOL IDE UDMA133 controller\n");
 				chipset_family = ATA_133;
 
@@ -779,6 +779,11 @@ static unsigned int __devinit init_chips
 					printk(KERN_INFO "SIS5513: Switching to 5513 register mapping\n");
 				}
 			}
+
+			if (trueid == PCI_DEVICE_ID_SI_180) {
+				chipset_family = ATA_133;
+				printk(KERN_INFO "SIS5513: SiS 965 IDE UDMA133 controller\n");
+			}
 	}
 
 	if (!chipset_family) { /* Belongs to pci-quirks */
@@ -953,6 +958,7 @@ static int __devinit sis5513_init_one(st
 static struct pci_device_id sis5513_pci_tbl[] = {
 	{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5518, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_180,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 1e737e2..724a98e 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -581,6 +581,7 @@
 #define PCI_DEVICE_ID_SI_ACPI		0x0009
 #define PCI_DEVICE_ID_SI_SMBUS		0x0016
 #define PCI_DEVICE_ID_SI_LPC		0x0018
+#define PCI_DEVICE_ID_SI_180		0x0180
 #define PCI_DEVICE_ID_SI_5597_VGA	0x0200
 #define PCI_DEVICE_ID_SI_6205		0x0205
 #define PCI_DEVICE_ID_SI_501		0x0406
---
0.99.9k



  reply	other threads:[~2005-12-13 18:25 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-12-13 18:22 [PATCH 0/2] Sync Ubuntu patches Ben Collins
2005-12-13 18:23 ` [PATCH 1/2] asus_acpi: Invert read of wled proc file to show correct state of LED Ben Collins
2005-12-13 18:24   ` Ben Collins [this message]
2005-12-13 18:38     ` [PATCH 2/2] ide/sis5513: Add support for 965 chipset Bartlomiej Zolnierkiewicz
2005-12-13 19:30       ` Ben Collins
2005-12-13 19:57         ` Bartlomiej Zolnierkiewicz
2005-12-13 20:41           ` Ben Collins
2005-12-13 21:06             ` Bartlomiej Zolnierkiewicz
2005-12-13 23:39               ` Ben Collins

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1134498254295-git-send-email-bcollins@ubuntu.com \
    --to=bcollins@ubuntu.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.