pata_ns87415: Power Management fix
Fix ->resume method to do chipset specific setup. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
2a2beac928
commit
a809c68752
|
@ -325,6 +325,13 @@ static struct scsi_host_template ns87415_sht = {
|
||||||
ATA_BMDMA_SHT(DRV_NAME),
|
ATA_BMDMA_SHT(DRV_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void ns87415_fixup(struct pci_dev *pdev)
|
||||||
|
{
|
||||||
|
/* Select 512 byte sectors */
|
||||||
|
pci_write_config_byte(pdev, 0x55, 0xEE);
|
||||||
|
/* Select PIO0 8bit clocking */
|
||||||
|
pci_write_config_byte(pdev, 0x54, 0xB7);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ns87415_init_one - Register 87415 ATA PCI device with kernel services
|
* ns87415_init_one - Register 87415 ATA PCI device with kernel services
|
||||||
|
@ -371,10 +378,8 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *e
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
/* Select 512 byte sectors */
|
ns87415_fixup(pdev);
|
||||||
pci_write_config_byte(pdev, 0x55, 0xEE);
|
|
||||||
/* Select PIO0 8bit clocking */
|
|
||||||
pci_write_config_byte(pdev, 0x54, 0xB7);
|
|
||||||
return ata_pci_sff_init_one(pdev, ppi, &ns87415_sht, NULL);
|
return ata_pci_sff_init_one(pdev, ppi, &ns87415_sht, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -384,6 +389,23 @@ static const struct pci_device_id ns87415_pci_tbl[] = {
|
||||||
{ } /* terminate list */
|
{ } /* terminate list */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef CONFIG_PM
|
||||||
|
static int ns87415_reinit_one(struct pci_dev *pdev)
|
||||||
|
{
|
||||||
|
struct ata_host *host = dev_get_drvdata(&pdev->dev);
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
rc = ata_pci_device_do_resume(pdev);
|
||||||
|
if (rc)
|
||||||
|
return rc;
|
||||||
|
|
||||||
|
ns87415_fixup(pdev);
|
||||||
|
|
||||||
|
ata_host_resume(host);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static struct pci_driver ns87415_pci_driver = {
|
static struct pci_driver ns87415_pci_driver = {
|
||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
.id_table = ns87415_pci_tbl,
|
.id_table = ns87415_pci_tbl,
|
||||||
|
@ -391,7 +413,7 @@ static struct pci_driver ns87415_pci_driver = {
|
||||||
.remove = ata_pci_remove_one,
|
.remove = ata_pci_remove_one,
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
.suspend = ata_pci_device_suspend,
|
.suspend = ata_pci_device_suspend,
|
||||||
.resume = ata_pci_device_resume,
|
.resume = ns87415_reinit_one,
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue