Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata: Fix experimental tags pata_ninja32: update ID table pata_sis: Remove bogus cable match ATA: piix, fix pointer deref on suspend pata_hpt366: fix clock detection
This commit is contained in:
commit
6f8e5850df
|
@ -153,7 +153,7 @@ config SATA_PROMISE
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config SATA_SX4
|
config SATA_SX4
|
||||||
tristate "Promise SATA SX4 support"
|
tristate "Promise SATA SX4 support (Experimental)"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI && EXPERIMENTAL
|
||||||
help
|
help
|
||||||
This option enables support for Promise Serial ATA SX4.
|
This option enables support for Promise Serial ATA SX4.
|
||||||
|
@ -219,8 +219,8 @@ config PATA_ACPI
|
||||||
otherwise unsupported hardware.
|
otherwise unsupported hardware.
|
||||||
|
|
||||||
config PATA_ALI
|
config PATA_ALI
|
||||||
tristate "ALi PATA support (Experimental)"
|
tristate "ALi PATA support"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI
|
||||||
help
|
help
|
||||||
This option enables support for the ALi ATA interfaces
|
This option enables support for the ALi ATA interfaces
|
||||||
found on the many ALi chipsets.
|
found on the many ALi chipsets.
|
||||||
|
@ -263,7 +263,7 @@ config PATA_ATIIXP
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config PATA_CMD640_PCI
|
config PATA_CMD640_PCI
|
||||||
tristate "CMD640 PCI PATA support (Very Experimental)"
|
tristate "CMD640 PCI PATA support (Experimental)"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI && EXPERIMENTAL
|
||||||
help
|
help
|
||||||
This option enables support for the CMD640 PCI IDE
|
This option enables support for the CMD640 PCI IDE
|
||||||
|
@ -291,8 +291,8 @@ config PATA_CS5520
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config PATA_CS5530
|
config PATA_CS5530
|
||||||
tristate "CS5530 PATA support (Experimental)"
|
tristate "CS5530 PATA support"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI
|
||||||
help
|
help
|
||||||
This option enables support for the Cyrix/NatSemi/AMD CS5530
|
This option enables support for the Cyrix/NatSemi/AMD CS5530
|
||||||
companion chip used with the MediaGX/Geode processor family.
|
companion chip used with the MediaGX/Geode processor family.
|
||||||
|
@ -309,8 +309,8 @@ config PATA_CS5535
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config PATA_CS5536
|
config PATA_CS5536
|
||||||
tristate "CS5536 PATA support (Experimental)"
|
tristate "CS5536 PATA support"
|
||||||
depends on PCI && X86 && !X86_64 && EXPERIMENTAL
|
depends on PCI && X86 && !X86_64
|
||||||
help
|
help
|
||||||
This option enables support for the AMD CS5536
|
This option enables support for the AMD CS5536
|
||||||
companion chip used with the Geode LX processor family.
|
companion chip used with the Geode LX processor family.
|
||||||
|
@ -363,7 +363,7 @@ config PATA_HPT37X
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config PATA_HPT3X2N
|
config PATA_HPT3X2N
|
||||||
tristate "HPT 372N/302N PATA support (Very Experimental)"
|
tristate "HPT 372N/302N PATA support (Experimental)"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI && EXPERIMENTAL
|
||||||
help
|
help
|
||||||
This option enables support for the N variant HPT PATA
|
This option enables support for the N variant HPT PATA
|
||||||
|
@ -389,8 +389,8 @@ config PATA_HPT3X3_DMA
|
||||||
problems with DMA on this chipset.
|
problems with DMA on this chipset.
|
||||||
|
|
||||||
config PATA_ISAPNP
|
config PATA_ISAPNP
|
||||||
tristate "ISA Plug and Play PATA support (Experimental)"
|
tristate "ISA Plug and Play PATA support"
|
||||||
depends on EXPERIMENTAL && ISAPNP
|
depends on ISAPNP
|
||||||
help
|
help
|
||||||
This option enables support for ISA plug & play ATA
|
This option enables support for ISA plug & play ATA
|
||||||
controllers such as those found on old soundcards.
|
controllers such as those found on old soundcards.
|
||||||
|
@ -498,8 +498,8 @@ config PATA_NINJA32
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config PATA_NS87410
|
config PATA_NS87410
|
||||||
tristate "Nat Semi NS87410 PATA support (Experimental)"
|
tristate "Nat Semi NS87410 PATA support"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI
|
||||||
help
|
help
|
||||||
This option enables support for the National Semiconductor
|
This option enables support for the National Semiconductor
|
||||||
NS87410 PCI-IDE controller.
|
NS87410 PCI-IDE controller.
|
||||||
|
@ -507,8 +507,8 @@ config PATA_NS87410
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config PATA_NS87415
|
config PATA_NS87415
|
||||||
tristate "Nat Semi NS87415 PATA support (Experimental)"
|
tristate "Nat Semi NS87415 PATA support"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI
|
||||||
help
|
help
|
||||||
This option enables support for the National Semiconductor
|
This option enables support for the National Semiconductor
|
||||||
NS87415 PCI-IDE controller.
|
NS87415 PCI-IDE controller.
|
||||||
|
@ -544,8 +544,8 @@ config PATA_PCMCIA
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config PATA_PDC_OLD
|
config PATA_PDC_OLD
|
||||||
tristate "Older Promise PATA controller support (Experimental)"
|
tristate "Older Promise PATA controller support"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI
|
||||||
help
|
help
|
||||||
This option enables support for the Promise 20246, 20262, 20263,
|
This option enables support for the Promise 20246, 20262, 20263,
|
||||||
20265 and 20267 adapters.
|
20265 and 20267 adapters.
|
||||||
|
@ -559,7 +559,7 @@ config PATA_QDI
|
||||||
Support for QDI 6500 and 6580 PATA controllers on VESA local bus.
|
Support for QDI 6500 and 6580 PATA controllers on VESA local bus.
|
||||||
|
|
||||||
config PATA_RADISYS
|
config PATA_RADISYS
|
||||||
tristate "RADISYS 82600 PATA support (Very Experimental)"
|
tristate "RADISYS 82600 PATA support (Experimental)"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI && EXPERIMENTAL
|
||||||
help
|
help
|
||||||
This option enables support for the RADISYS 82600
|
This option enables support for the RADISYS 82600
|
||||||
|
@ -586,8 +586,8 @@ config PATA_RZ1000
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config PATA_SC1200
|
config PATA_SC1200
|
||||||
tristate "SC1200 PATA support (Very Experimental)"
|
tristate "SC1200 PATA support"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI
|
||||||
help
|
help
|
||||||
This option enables support for the NatSemi/AMD SC1200 SoC
|
This option enables support for the NatSemi/AMD SC1200 SoC
|
||||||
companion chip used with the Geode processor family.
|
companion chip used with the Geode processor family.
|
||||||
|
@ -620,8 +620,8 @@ config PATA_SIL680
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config PATA_SIS
|
config PATA_SIS
|
||||||
tristate "SiS PATA support (Experimental)"
|
tristate "SiS PATA support"
|
||||||
depends on PCI && EXPERIMENTAL
|
depends on PCI
|
||||||
help
|
help
|
||||||
This option enables support for SiS PATA controllers
|
This option enables support for SiS PATA controllers
|
||||||
|
|
||||||
|
|
|
@ -1072,7 +1072,14 @@ static int piix_broken_suspend(void)
|
||||||
* matching is necessary because dmi_system_id.matches is
|
* matching is necessary because dmi_system_id.matches is
|
||||||
* limited to four entries.
|
* limited to four entries.
|
||||||
*/
|
*/
|
||||||
if (!strcmp(dmi_get_system_info(DMI_SYS_VENDOR), "TOSHIBA") &&
|
if (dmi_get_system_info(DMI_SYS_VENDOR) &&
|
||||||
|
dmi_get_system_info(DMI_PRODUCT_NAME) &&
|
||||||
|
dmi_get_system_info(DMI_PRODUCT_VERSION) &&
|
||||||
|
dmi_get_system_info(DMI_PRODUCT_SERIAL) &&
|
||||||
|
dmi_get_system_info(DMI_BOARD_VENDOR) &&
|
||||||
|
dmi_get_system_info(DMI_BOARD_NAME) &&
|
||||||
|
dmi_get_system_info(DMI_BOARD_VERSION) &&
|
||||||
|
!strcmp(dmi_get_system_info(DMI_SYS_VENDOR), "TOSHIBA") &&
|
||||||
!strcmp(dmi_get_system_info(DMI_PRODUCT_NAME), "000000") &&
|
!strcmp(dmi_get_system_info(DMI_PRODUCT_NAME), "000000") &&
|
||||||
!strcmp(dmi_get_system_info(DMI_PRODUCT_VERSION), "000000") &&
|
!strcmp(dmi_get_system_info(DMI_PRODUCT_VERSION), "000000") &&
|
||||||
!strcmp(dmi_get_system_info(DMI_PRODUCT_SERIAL), "000000") &&
|
!strcmp(dmi_get_system_info(DMI_PRODUCT_SERIAL), "000000") &&
|
||||||
|
|
|
@ -382,10 +382,10 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
|
||||||
/* PCI clocking determines the ATA timing values to use */
|
/* PCI clocking determines the ATA timing values to use */
|
||||||
/* info_hpt366 is safe against re-entry so we can scribble on it */
|
/* info_hpt366 is safe against re-entry so we can scribble on it */
|
||||||
switch((reg1 & 0x700) >> 8) {
|
switch((reg1 & 0x700) >> 8) {
|
||||||
case 5:
|
case 9:
|
||||||
hpriv = &hpt366_40;
|
hpriv = &hpt366_40;
|
||||||
break;
|
break;
|
||||||
case 9:
|
case 5:
|
||||||
hpriv = &hpt366_25;
|
hpriv = &hpt366_25;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
#include <linux/libata.h>
|
#include <linux/libata.h>
|
||||||
|
|
||||||
#define DRV_NAME "pata_ninja32"
|
#define DRV_NAME "pata_ninja32"
|
||||||
#define DRV_VERSION "0.1.1"
|
#define DRV_VERSION "0.1.3"
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -130,7 +130,8 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
|
||||||
return rc;
|
return rc;
|
||||||
pci_set_master(dev);
|
pci_set_master(dev);
|
||||||
|
|
||||||
/* Set up the register mappings */
|
/* Set up the register mappings. We use the I/O mapping as only the
|
||||||
|
older chips also have MMIO on BAR 1 */
|
||||||
base = host->iomap[0];
|
base = host->iomap[0];
|
||||||
if (!base)
|
if (!base)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -167,8 +168,12 @@ static int ninja32_reinit_one(struct pci_dev *pdev)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const struct pci_device_id ninja32[] = {
|
static const struct pci_device_id ninja32[] = {
|
||||||
|
{ 0x10FC, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||||
|
{ 0x1145, 0x8008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||||
|
{ 0x1145, 0xf008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||||
{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||||
{ 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
{ 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||||
|
{ 0x1145, 0xf02C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||||
{ },
|
{ },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,6 @@ static const struct sis_laptop sis_laptop[] = {
|
||||||
{ 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */
|
{ 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */
|
||||||
{ 0x5513, 0x1734, 0x105F }, /* FSC Amilo A1630 */
|
{ 0x5513, 0x1734, 0x105F }, /* FSC Amilo A1630 */
|
||||||
{ 0x5513, 0x1071, 0x8640 }, /* EasyNote K5305 */
|
{ 0x5513, 0x1071, 0x8640 }, /* EasyNote K5305 */
|
||||||
{ 0x5513, 0x1039, 0x5513 }, /* Targa Visionary 1000 */
|
|
||||||
/* end marker */
|
/* end marker */
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
|
|
Reference in New Issue