/[linux-patches]/genpatches-2.6/tags/2.6.15-2/4000_intel-ich8.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.15-2/4000_intel-ich8.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 259 - (show annotations) (download)
Wed Jan 11 21:46:01 2006 UTC (8 years, 8 months ago) by dsd
File size: 7253 byte(s)
2.6.15-2 release
1 unchanged:
2 --- linux-2.6.15/arch/i386/pci/irq.c.orig 2006-01-02 19:21:10.000000000 -0800
3 +++ linux-2.6.15/arch/i386/pci/irq.c 2006-01-09 08:18:08.007292384 -0800
4 @@ -539,6 +539,11 @@
5 case PCI_DEVICE_ID_INTEL_ICH7_30:
6 case PCI_DEVICE_ID_INTEL_ICH7_31:
7 case PCI_DEVICE_ID_INTEL_ESB2_0:
8 + case PCI_DEVICE_ID_INTEL_ICH8_0:
9 + case PCI_DEVICE_ID_INTEL_ICH8_1:
10 + case PCI_DEVICE_ID_INTEL_ICH8_2:
11 + case PCI_DEVICE_ID_INTEL_ICH8_3:
12 + case PCI_DEVICE_ID_INTEL_ICH8_4:
13 r->name = "PIIX/ICH";
14 r->get = pirq_piix_get;
15 r->set = pirq_piix_set;
16 unchanged:
17 --- linux-2.6.15/include/linux/pci_ids.h.orig 2006-01-02 19:21:10.000000000 -0800
18 +++ linux-2.6.15/include/linux/pci_ids.h 2006-01-09 08:18:08.015291168 -0800
19 @@ -2055,6 +2055,13 @@
20 #define PCI_DEVICE_ID_INTEL_ICH7_19 0x27dd
21 #define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de
22 #define PCI_DEVICE_ID_INTEL_ICH7_21 0x27df
23 +#define PCI_DEVICE_ID_INTEL_ICH8_0 0x2810
24 +#define PCI_DEVICE_ID_INTEL_ICH8_1 0x2811
25 +#define PCI_DEVICE_ID_INTEL_ICH8_2 0x2812
26 +#define PCI_DEVICE_ID_INTEL_ICH8_3 0x2814
27 +#define PCI_DEVICE_ID_INTEL_ICH8_4 0x2815
28 +#define PCI_DEVICE_ID_INTEL_ICH8_5 0x283e
29 +#define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850
30 #define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340
31 #define PCI_DEVICE_ID_INTEL_82830_HB 0x3575
32 #define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577
33 unchanged:
34 --- linux-2.6.15/drivers/pci/quirks.c.orig 2006-01-02 19:21:10.000000000 -0800
35 +++ linux-2.6.15/drivers/pci/quirks.c 2006-01-09 08:18:08.012291624 -0800
36 @@ -1125,6 +1125,9 @@
37 case 0x27c4:
38 ich = 7;
39 break;
40 + case 0x2828: /* ICH8M */
41 + ich = 8;
42 + break;
43 default:
44 /* we do not handle this PCI device */
45 return;
46 @@ -1144,7 +1147,7 @@
47 else
48 return; /* not in combined mode */
49 } else {
50 - WARN_ON((ich != 6) && (ich != 7));
51 + WARN_ON((ich != 6) && (ich != 7) && (ich != 8));
52 tmp &= 0x3; /* interesting bits 1:0 */
53 if (tmp & (1 << 0))
54 comb = (1 << 2); /* PATA port 0, SATA port 1 */
55 unchanged:
56 --- linux-2.6.15/drivers/scsi/ata_piix.c.orig 2006-01-02 19:21:10.000000000 -0800
57 +++ linux-2.6.15/drivers/scsi/ata_piix.c 2006-01-09 08:18:08.013291472 -0800
58 @@ -81,6 +81,7 @@
59 ich6_sata_rm = 4,
60 ich7_sata = 5,
61 esb2_sata = 6,
62 + ich8_sata = 7,
63
64 PIIX_AHCI_DEVICE = 6,
65 };
66 @@ -116,6 +117,9 @@
67 { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
68 { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
69 { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, esb2_sata },
70 + { 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
71 + { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
72 + { 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
73
74 { } /* terminate list */
75 };
76 @@ -293,6 +297,18 @@
77 .udma_mask = 0x7f, /* udma0-6 */
78 .port_ops = &piix_sata_ops,
79 },
80 +
81 + /* ich8_sata */
82 + {
83 + .sht = &piix_sht,
84 + .host_flags = ATA_FLAG_SATA | ATA_FLAG_SRST |
85 + PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR |
86 + ATA_FLAG_SLAVE_POSS | PIIX_FLAG_AHCI,
87 + .pio_mask = 0x1f, /* pio0-4 */
88 + .mwdma_mask = 0x07, /* mwdma0-2 */
89 + .udma_mask = 0x7f, /* udma0-6 */
90 + .port_ops = &piix_sata_ops,
91 + },
92 };
93
94 static struct pci_bits piix_enable_bits[] = {
95 unchanged:
96 --- linux-2.6.15/drivers/i2c/busses/i2c-i801.c.orig 2006-01-02 19:21:10.000000000 -0800
97 +++ linux-2.6.15/drivers/i2c/busses/i2c-i801.c 2006-01-09 08:18:08.008292232 -0800
98 @@ -32,6 +32,7 @@
99 ICH6 266A
100 ICH7 27DA
101 ESB2 269B
102 + ICH8 283E
103 This driver supports several versions of Intel's I/O Controller Hubs (ICH).
104 For SMBus support, they are similar to the PIIX4 and are part
105 of Intel's '810' and other chipsets.
106 @@ -531,6 +532,7 @@
107 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_16) },
108 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_17) },
109 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
110 + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
111 { 0, }
112 };
113
114 unchanged:
115 --- linux-2.6.15/drivers/i2c/busses/Kconfig.orig 2006-01-02 19:21:10.000000000 -0800
116 +++ linux-2.6.15/drivers/i2c/busses/Kconfig 2006-01-09 08:18:08.009292080 -0800
117 @@ -124,6 +124,7 @@
118 ICH6
119 ICH7
120 ESB2
121 + ICH8
122
123 This driver can also be built as a module. If so, the module
124 will be called i2c-i801.
125 unchanged:
126 --- linux-2.6.15/drivers/scsi/ahci.c.orig 2006-01-02 19:21:10.000000000 -0800
127 +++ linux-2.6.15/drivers/scsi/ahci.c 2006-01-09 08:18:08.014291320 -0800
128 @@ -277,6 +277,16 @@
129 board_ahci }, /* ESB2 */
130 { PCI_VENDOR_ID_INTEL, 0x27c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
131 board_ahci }, /* ICH7-M DH */
132 + { PCI_VENDOR_ID_INTEL, 0x2821, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
133 + board_ahci }, /* ICH8 */
134 + { PCI_VENDOR_ID_INTEL, 0x2822, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
135 + board_ahci }, /* ICH8 */
136 + { PCI_VENDOR_ID_INTEL, 0x2824, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
137 + board_ahci }, /* ICH8 */
138 + { PCI_VENDOR_ID_INTEL, 0x2829, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
139 + board_ahci }, /* ICH8M */
140 + { PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
141 + board_ahci }, /* ICH8M */
142 { } /* terminate list */
143 };
144
145 unchanged:
146 --- linux-2.6.15/sound/pci/hda/hda_intel.c.orig 2006-01-02 19:21:10.000000000 -0800
147 +++ linux-2.6.15/sound/pci/hda/hda_intel.c 2006-01-09 08:18:08.017290864 -0800
148 @@ -70,6 +70,7 @@
149 "{Intel, ICH6M},"
150 "{Intel, ICH7},"
151 "{Intel, ESB2},"
152 + "{Intel, ICH8 },"
153 "{ATI, SB450},"
154 "{VIA, VT8251},"
155 "{VIA, VT8237A},"
156 @@ -1603,6 +1604,7 @@
157 { 0x8086, 0x2668, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH6 */
158 { 0x8086, 0x27d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH7 */
159 { 0x8086, 0x269a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ESB2 */
160 + { 0x8086, 0x284b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH8 */
161 { 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */
162 { 0x1106, 0x3288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_VIA }, /* VIA VT8251/VT8237A */
163 { 0x1039, 0x7502, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_SIS }, /* SIS966 */
164 only in patch2:
165 unchanged:
166 --- linux-2.6.15/drivers/ide/pci/piix.c.orig 2006-01-02 19:21:10.000000000 -0800
167 +++ linux-2.6.15/drivers/ide/pci/piix.c 2006-01-09 08:18:08.010291928 -0800
168 @@ -135,6 +135,7 @@
169 case PCI_DEVICE_ID_INTEL_ICH6_19:
170 case PCI_DEVICE_ID_INTEL_ICH7_21:
171 case PCI_DEVICE_ID_INTEL_ESB2_18:
172 + case PCI_DEVICE_ID_INTEL_ICH8_6:
173 mode = 3;
174 break;
175 /* UDMA 66 capable */
176 @@ -449,6 +450,7 @@
177 case PCI_DEVICE_ID_INTEL_ICH6_19:
178 case PCI_DEVICE_ID_INTEL_ICH7_21:
179 case PCI_DEVICE_ID_INTEL_ESB2_18:
180 + case PCI_DEVICE_ID_INTEL_ICH8_6:
181 {
182 unsigned int extra = 0;
183 pci_read_config_dword(dev, 0x54, &extra);
184 @@ -575,6 +577,7 @@
185 /* 21 */ DECLARE_PIIX_DEV("ICH7"),
186 /* 22 */ DECLARE_PIIX_DEV("ICH4"),
187 /* 23 */ DECLARE_PIIX_DEV("ESB2"),
188 + /* 24 */ DECLARE_PIIX_DEV("ICH8M"),
189 };
190
191 /**
192 @@ -651,6 +654,7 @@
193 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21},
194 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 22},
195 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_18, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 23},
196 + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 24},
197 { 0, },
198 };
199 MODULE_DEVICE_TABLE(pci, piix_pci_tbl);

  ViewVC Help
Powered by ViewVC 1.1.20