diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2011-10-11 14:04:05 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2011-10-14 13:08:05 -0400 |
commit | 73222c2ddf5e2da2223d0b7329bad85c7e6ae1f8 (patch) | |
tree | dcea643e37026c9033f6649d2237723f4132c70b /drivers/ata | |
parent | f4c6ae50209a4405b2b0bc99eb449060877eef42 (diff) |
pata_cs5535: no need to program PIO0 timings during device init
Core libata code takes care of it nowadays.
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/pata_cs5535.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c index 697a3edd38c3..a0b4640125ae 100644 --- a/drivers/ata/pata_cs5535.c +++ b/drivers/ata/pata_cs5535.c | |||
@@ -67,8 +67,6 @@ | |||
67 | 67 | ||
68 | #define CS5535_CABLE_DETECT 0x48 | 68 | #define CS5535_CABLE_DETECT 0x48 |
69 | 69 | ||
70 | #define CS5535_BAD_PIO(timings) ( (timings&~0x80000000UL)==0x00009172 ) | ||
71 | |||
72 | /** | 70 | /** |
73 | * cs5535_cable_detect - detect cable type | 71 | * cs5535_cable_detect - detect cable type |
74 | * @ap: Port to detect on | 72 | * @ap: Port to detect on |
@@ -188,16 +186,6 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
188 | }; | 186 | }; |
189 | const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; | 187 | const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; |
190 | 188 | ||
191 | u32 timings, dummy; | ||
192 | |||
193 | /* Check the BIOS set the initial timing clock. If not set the | ||
194 | timings for PIO0 */ | ||
195 | rdmsr(ATAC_CH0D0_PIO, timings, dummy); | ||
196 | if (CS5535_BAD_PIO(timings)) | ||
197 | wrmsr(ATAC_CH0D0_PIO, 0xF7F4F7F4UL, 0); | ||
198 | rdmsr(ATAC_CH0D1_PIO, timings, dummy); | ||
199 | if (CS5535_BAD_PIO(timings)) | ||
200 | wrmsr(ATAC_CH0D1_PIO, 0xF7F4F7F4UL, 0); | ||
201 | return ata_pci_bmdma_init_one(dev, ppi, &cs5535_sht, NULL, 0); | 189 | return ata_pci_bmdma_init_one(dev, ppi, &cs5535_sht, NULL, 0); |
202 | } | 190 | } |
203 | 191 | ||