Updated kernel25 to 2.6.25.18

[people/teissler/ipfire-2.x.git] / src / patches / linux-h12y-mmio-quirks.patch

diff --git a/src/patches/linux-h12y-mmio-quirks.patch b/src/patches/linux-h12y-mmio-quirks.patch
old mode 100644 (file)
new mode 100755 (executable)
index d7c2b35..8f258bb
--- a/src/patches/linux-h12y-mmio-quirks.patch
+++ b/src/patches/linux-h12y-mmio-quirks.patch
@@ -1,6 +1,6 @@
---- a/drivers/pci/quirks.c     2008-09-08 20:33:16.000000000 +0200
-+++ b/drivers/pci/quirks.c     2008-09-11 08:52:32.000000000 +0200
-@@ -1381,6 +1381,50 @@
+--- linux/drivers/pci/quirks.c 2008-09-08 20:33:16.000000000 +0200
++++ linux/drivers/pci/quirks.c 2008-10-06 16:37:35.000000000 +0200
+@@ -1381,6 +1381,82 @@
                         PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE,
                         quirk_tc86c001_ide);
  
@@ -9,8 +9,8 @@
 + * resources that seems to be used by an unknown device.
 + * This quirk reserve more than really used mmio space to
 + * force change the mmio area of the cardreader and the network chip.
-+ * See http://bugzilla.kerbel.org/show_bug.cgi?id=10231
-+ * and http://bugzilla.kerbel.org/show_bug.cgi?id=9905
++ * See http://bugzilla.kernel.org/show_bug.cgi?id=10231
++ * and http://bugzilla.kernel.org/show_bug.cgi?id=9905
 + * for more details
 + */
 +static void __init quirk_h12y_1_mmio(struct pci_dev *dev)
@@ -47,6 +47,38 @@
 +}
 +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x7120,quirk_h12y_2_mmio);
 +
++static void __init quirk_h12y_3_mmio(struct pci_dev *dev)
++{
++/*
++ * Firewire Device: O2 00F7 of Twinhead H12Y
++ * PCI VENDOR: 0x1217 PCI ID:0x00F7
++ * SUB VENDOR: 0x14FF SUB ID:0xA003
++ */
++      struct resource *r = &dev->resource[1];
++      if ((dev->subsystem_vendor) == 0x14FF &&
++          (dev->subsystem_device) == 0xA003) {
++              r->start = 0;
++              r->end = 0x0fff;
++      }       
++}
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x00F7,quirk_h12y_3_mmio);
++
++static void __init quirk_h12y_4_mmio(struct pci_dev *dev)
++{
++/*
++ * MS-Cardreader Device: O2 7130 of Twinhead H12Y
++ * PCI VENDOR: 0x1217 PCI ID:0x7130
++ * SUB VENDOR: 0x14FF SUB ID:0xA003
++ */
++      struct resource *r = &dev->resource[0];
++      if ((dev->subsystem_vendor) == 0x14FF &&
++          (dev->subsystem_device) == 0xA003) {
++              r->start = 0;
++              r->end = 0x1fff;
++      }       
++}
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x7130,quirk_h12y_4_mmio);
++
 +
  static void __devinit quirk_netmos(struct pci_dev *dev)
  {