Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

+39 -3
+1
drivers/ide/Kconfig
··· 764 764 config BLK_DEV_IDEDMA_PMAC 765 765 bool "PowerMac IDE DMA support" 766 766 depends on BLK_DEV_IDE_PMAC 767 + select BLK_DEV_IDEDMA_PCI 767 768 help 768 769 This option allows the driver for the built-in IDE controller on 769 770 Power Macintoshes and PowerBooks to use DMA (direct memory access)
+1 -1
drivers/ide/ide-floppy.c
··· 317 317 unsigned long flags; 318 318 } idefloppy_floppy_t; 319 319 320 - #define IDEFLOPPY_TICKS_DELAY 3 /* default delay for ZIP 100 */ 320 + #define IDEFLOPPY_TICKS_DELAY HZ/20 /* default delay for ZIP 100 (50ms) */ 321 321 322 322 /* 323 323 * Floppy flag bits values.
+7
drivers/ide/pci/generic.c
··· 173 173 .channels = 2, 174 174 .autodma = NOAUTODMA, 175 175 .bootable = ON_BOARD, 176 + },{ /* 14 */ 177 + .name = "Revolution", 178 + .init_hwif = init_hwif_generic, 179 + .channels = 2, 180 + .autodma = AUTODMA, 181 + .bootable = OFF_BOARD, 176 182 } 177 183 }; 178 184 ··· 237 231 { PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11}, 238 232 { PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12}, 239 233 { PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13}, 234 + { PCI_VENDOR_ID_NETCELL,PCI_DEVICE_ID_REVOLUTION, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14}, 240 235 /* Must come last. If you add entries adjust this table appropriately and the init_one code */ 241 236 { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL, 0}, 242 237 { 0, },
+23
drivers/ide/pci/serverworks.c
··· 21 21 * 22 22 * CSB6: `Champion South Bridge' IDE Interface (optional: third channel) 23 23 * 24 + * HT1000: AKA BCM5785 - Hypertransport Southbridge for Opteron systems. IDE 25 + * controller same as the CSB6. Single channel ATA100 only. 26 + * 24 27 * Documentation: 25 28 * Available under NDA only. Errata info very hard to get. 26 29 * ··· 74 71 if (!svwks_revision) 75 72 pci_read_config_byte(dev, PCI_REVISION_ID, &svwks_revision); 76 73 74 + if (dev->device == PCI_DEVICE_ID_SERVERWORKS_HT1000IDE) 75 + return 2; 77 76 if (dev->device == PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) { 78 77 u32 reg = 0; 79 78 if (isa_dev) ··· 114 109 case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE: 115 110 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE: 116 111 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2: 112 + case PCI_DEVICE_ID_SERVERWORKS_HT1000IDE: 117 113 return 1; 118 114 default: 119 115 break; ··· 444 438 btr |= (svwks_revision >= SVWKS_CSB5_REVISION_NEW) ? 0x3 : 0x2; 445 439 pci_write_config_byte(dev, 0x5A, btr); 446 440 } 441 + /* Setup HT1000 SouthBridge Controller - Single Channel Only */ 442 + else if (dev->device == PCI_DEVICE_ID_SERVERWORKS_HT1000IDE) { 443 + pci_read_config_byte(dev, 0x5A, &btr); 444 + btr &= ~0x40; 445 + btr |= 0x3; 446 + pci_write_config_byte(dev, 0x5A, btr); 447 + } 447 448 448 449 return (dev->irq) ? dev->irq : 0; 449 450 } ··· 642 629 .channels = 1, /* 2 */ 643 630 .autodma = AUTODMA, 644 631 .bootable = ON_BOARD, 632 + },{ /* 4 */ 633 + .name = "SvrWks HT1000", 634 + .init_setup = init_setup_svwks, 635 + .init_chipset = init_chipset_svwks, 636 + .init_hwif = init_hwif_svwks, 637 + .init_dma = init_dma_svwks, 638 + .channels = 1, /* 2 */ 639 + .autodma = AUTODMA, 640 + .bootable = ON_BOARD, 645 641 } 646 642 }; 647 643 ··· 675 653 { PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, 676 654 { PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, 677 655 { PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3}, 656 + { PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4}, 678 657 { 0, }, 679 658 }; 680 659 MODULE_DEVICE_TABLE(pci, svwks_pci_tbl);
+1 -1
drivers/ide/ppc/pmac.c
··· 1664 1664 }; 1665 1665 1666 1666 static struct pci_device_id pmac_ide_pci_match[] = { 1667 - { PCI_VENDOR_ID_APPLE, PCI_DEVIEC_ID_APPLE_UNI_N_ATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 1667 + { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_ATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 1668 1668 { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID_ATA100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 1669 1669 { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_K2_ATA100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 1670 1670 { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_SH_ATA,
+1
drivers/ide/setup-pci.c
··· 229 229 case PCI_DEVICE_ID_AMD_VIPER_7409: 230 230 case PCI_DEVICE_ID_CMD_643: 231 231 case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE: 232 + case PCI_DEVICE_ID_REVOLUTION: 232 233 simplex_stat = hwif->INB(dma_base + 2); 233 234 hwif->OUTB((simplex_stat&0x60),(dma_base + 2)); 234 235 simplex_stat = hwif->INB(dma_base + 2);
+5 -1
include/linux/pci_ids.h
··· 881 881 #define PCI_DEVICE_ID_APPLE_UNI_N_PCI15 0x002e 882 882 #define PCI_DEVICE_ID_APPLE_UNI_N_FW2 0x0030 883 883 #define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2 0x0032 884 - #define PCI_DEVIEC_ID_APPLE_UNI_N_ATA 0x0033 884 + #define PCI_DEVICE_ID_APPLE_UNI_N_ATA 0x0033 885 885 #define PCI_DEVICE_ID_APPLE_UNI_N_AGP2 0x0034 886 886 #define PCI_DEVICE_ID_APPLE_IPID_ATA100 0x003b 887 887 #define PCI_DEVICE_ID_APPLE_KEYLARGO_I 0x003e ··· 1580 1580 #define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211 1581 1581 #define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212 1582 1582 #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213 1583 + #define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214 1583 1584 #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217 1584 1585 #define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220 1585 1586 #define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB ··· 2184 2183 2185 2184 #define PCI_VENDOR_ID_SIBYTE 0x166d 2186 2185 #define PCI_DEVICE_ID_BCM1250_HT 0x0002 2186 + 2187 + #define PCI_VENDOR_ID_NETCELL 0x169c 2188 + #define PCI_DEVICE_ID_REVOLUTION 0x0044 2187 2189 2188 2190 #define PCI_VENDOR_ID_LINKSYS 0x1737 2189 2191 #define PCI_DEVICE_ID_LINKSYS_EG1032 0x1032