Author: dannf
Date: Mon Sep 18 21:34:33 2006
New Revision: 7451
Added:
people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/hp-diva-hurricane.dpatch
people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/hp-diva-rmp3.dpatch
Modified:
people/dannf/kernel-source-2.6.8-2.6.8/debian/changelog
people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge5dannf1
Log:
* hp-diva-rmp3.dpatch, hp-diva-hurricane.dpatch:
Add PCI IDs for newer Diva console ports
Modified: people/dannf/kernel-source-2.6.8-2.6.8/debian/changelog
==============================================================================
--- people/dannf/kernel-source-2.6.8-2.6.8/debian/changelog (original)
+++ people/dannf/kernel-source-2.6.8-2.6.8/debian/changelog Mon Sep 18
21:34:33 2006
@@ -1,8 +1,9 @@
kernel-source-2.6.8 (2.6.8-16sarge5dannf1) dannf; urgency=low
- *
+ * hp-diva-rmp3.dpatch, hp-diva-hurricane.dpatch:
+ Add PCI IDs for newer Diva console ports
- -- dann frazier <[EMAIL PROTECTED]> Mon, 18 Sep 2006 15:27:13 -0600
+ -- dann frazier <[EMAIL PROTECTED]> Mon, 18 Sep 2006 15:31:59 -0600
kernel-source-2.6.8 (2.6.8-16sarge5) stable-security; urgency=high
Added:
people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/hp-diva-hurricane.dpatch
==============================================================================
--- (empty file)
+++
people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/hp-diva-hurricane.dpatch
Mon Sep 18 21:34:33 2006
@@ -0,0 +1,35 @@
+From: Justin Chen <[EMAIL PROTECTED]>
+Date: Mon, 24 Oct 2005 21:16:38 +0000 (+0100)
+Subject: [SERIAL] new hp diva console port
+X-Git-Tag: v2.6.14
+X-Git-Url:
http://www.kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=551f8f0e87becb415c522adccab524a7a05ca83a
+
+ [SERIAL] new hp diva console port
+
+ Add the new ID 0x132a and configure the new PCI Diva console port. This
+ device supports only 1 single console UART.
+
+ Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
+ Signed-off-by: Russell King <[EMAIL PROTECTED]>
+---
+
+--- a/drivers/serial/8250_pci.c
++++ b/drivers/serial/8250_pci.c
+@@ -152,6 +152,7 @@ static int __devinit pci_hp_diva_init(st
+ rc = 4;
+ break;
+ case PCI_DEVICE_ID_HP_DIVA_POWERBAR:
++ case PCI_DEVICE_ID_HP_DIVA_HURRICANE:
+ rc = 1;
+ break;
+ }
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -723,6 +723,7 @@
+ #define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282
+ #define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290
+ #define PCI_DEVICE_ID_HP_DIVA_RMP3 0x1301
++#define PCI_DEVICE_ID_HP_DIVA_HURRICANE 0x132a
+ #define PCI_DEVICE_ID_HP_CISS 0x3210
+ #define PCI_DEVICE_ID_HP_CISSA 0x3220
+ #define PCI_DEVICE_ID_HP_CISSB 0x3222
Added: people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/hp-diva-rmp3.dpatch
==============================================================================
--- (empty file)
+++ people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/hp-diva-rmp3.dpatch
Mon Sep 18 21:34:33 2006
@@ -0,0 +1,66 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/03/19 16:11:36+00:00 [EMAIL PROTECTED](none)
+# [SERIAL] new hp diva console port
+#
+# Patch from Alex Williamson
+#
+# The patch below adds IDs and setup for a new PCI Diva console port.
+# This device provides a single UART described by PCI Bar 1. ID already
+# submitted to pciids.sf.net.
+#
+# Signed-off-by: Alex Williamson
+#
+# drivers/pci/pci.ids
+# 2005/03/19 16:06:07+00:00 [EMAIL PROTECTED](none) +1 -0
+# [PATCH] new hp diva console port
+#
+# drivers/serial/8250_pci.c
+# 2005/03/19 16:06:08+00:00 [EMAIL PROTECTED](none) +3 -0
+# [PATCH] new hp diva console port
+#
+# include/linux/pci_ids.h
+# 2005/03/19 16:06:09+00:00 [EMAIL PROTECTED](none) +1 -0
+# [PATCH] new hp diva console port
+#
+
+#
+# Backport by dann frazier <[EMAIL PROTECTED]>
+#
+
+diff -urN kernel-source-2.6.8.orig/drivers/pci/pci.ids
kernel-source-2.6.8/drivers/pci/pci.ids
+--- kernel-source-2.6.8.orig/drivers/pci/pci.ids 2005-05-16
12:35:54.233449000 -0600
++++ kernel-source-2.6.8/drivers/pci/pci.ids 2005-11-06 16:30:34.955615242
-0700
+@@ -1608,6 +1608,7 @@
+ 103c 1226 Keystone SP2
+ 103c 1227 Powerbar SP2
+ 103c 1282 Everest SP2
++ 103c 1301 Diva RMP3
+ 1054 PCI Local Bus Adapter
+ 1064 79C970 PCnet Ethernet Controller
+ 108b Visualize FXe
+diff -urN kernel-source-2.6.8.orig/drivers/serial/8250_pci.c
kernel-source-2.6.8/drivers/serial/8250_pci.c
+--- kernel-source-2.6.8.orig/drivers/serial/8250_pci.c 2005-05-16
12:35:54.233449000 -0600
++++ kernel-source-2.6.8/drivers/serial/8250_pci.c 2005-11-06
16:30:34.962452599 -0700
+@@ -2127,6 +2127,9 @@
+ * HP Diva card
+ */
+ { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA,
++ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA_RMP3, 0, 0,
++ pbn_b1_1_115200 },
++ { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ pbn_b0_5_115200 },
+ { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA_AUX,
+diff -urN kernel-source-2.6.8.orig/include/linux/pci_ids.h
kernel-source-2.6.8/include/linux/pci_ids.h
+--- kernel-source-2.6.8.orig/include/linux/pci_ids.h 2005-11-06
16:29:40.753929000 -0700
++++ kernel-source-2.6.8/include/linux/pci_ids.h 2005-11-06
16:32:08.706532346 -0700
+@@ -670,6 +670,7 @@
+ #define PCI_DEVICE_ID_HP_SX1000_IOC 0x127c
+ #define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282
+ #define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290
++#define PCI_DEVICE_ID_HP_DIVA_RMP3 0x1301
+ #define PCI_DEVICE_ID_HP_CISS 0x3210
+
+ #define PCI_VENDOR_ID_PCTECH 0x1042
Modified:
people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge5dannf1
==============================================================================
---
people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge5dannf1
(original)
+++
people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge5dannf1
Mon Sep 18 21:34:33 2006
@@ -0,0 +1,2 @@
++ hp-diva-rmp3.dpatch
++ hp-diva-hurricane.dpatch
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
