diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-11-16 23:42:19 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-11-16 23:42:19 +0000 |
| commit | 73a35a1aa445932176fca78688d43c636a3fda5e (patch) | |
| tree | ba8cca63507301045a685883b3b23b79eb3e476e /firmware/drivers/ata.c | |
| parent | d79f3a1e845bcad2d64cbaf467c0f0dae596f537 (diff) | |
| download | rockbox-73a35a1aa445932176fca78688d43c636a3fda5e.tar.gz rockbox-73a35a1aa445932176fca78688d43c636a3fda5e.zip | |
Reverted erroneous commit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7918 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/ata.c')
| -rw-r--r-- | firmware/drivers/ata.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index c0799f30e4..9cc49c1731 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c | |||
| @@ -1413,20 +1413,16 @@ int ata_init(void) | |||
| 1413 | or_b(0x02, &PADRH); /* release ATA reset */ | 1413 | or_b(0x02, &PADRH); /* release ATA reset */ |
| 1414 | PACR2 &= 0xBFFF; /* GPIO function for PA7 (IDE enable) */ | 1414 | PACR2 &= 0xBFFF; /* GPIO function for PA7 (IDE enable) */ |
| 1415 | #elif CONFIG_CPU == MCF5249 | 1415 | #elif CONFIG_CPU == MCF5249 |
| 1416 | #ifdef HAVE_ATA_LED_CTRL | ||
| 1417 | /* Enable disk LED & ISD chip power control */ | 1416 | /* Enable disk LED & ISD chip power control */ |
| 1418 | and_l(~0x0000240, &GPIO_OUT); | 1417 | and_l(~0x0000240, &GPIO_OUT); |
| 1419 | or_l(0x00000240, &GPIO_ENABLE); | 1418 | or_l(0x00000240, &GPIO_ENABLE); |
| 1420 | or_l(0x00000200, &GPIO_FUNCTION); | 1419 | or_l(0x00000200, &GPIO_FUNCTION); |
| 1421 | #endif | ||
| 1422 | 1420 | ||
| 1423 | /* ATA reset */ | 1421 | /* ATA reset */ |
| 1424 | and_l(~0x00080000, &GPIO_OUT); | 1422 | or_l(0x00080000, &GPIO_OUT); |
| 1425 | or_l(0x00080000, &GPIO_ENABLE); | 1423 | or_l(0x00080000, &GPIO_ENABLE); |
| 1426 | or_l(0x00080000, &GPIO_FUNCTION); | 1424 | or_l(0x00080000, &GPIO_FUNCTION); |
| 1427 | sleep(10); | 1425 | |
| 1428 | or_l(0x00080000, &GPIO_OUT); | ||
| 1429 | |||
| 1430 | /* FYI: The IDECONFIGx registers are set by set_cpu_frequency() */ | 1426 | /* FYI: The IDECONFIGx registers are set by set_cpu_frequency() */ |
| 1431 | #elif CONFIG_CPU == PP5020 | 1427 | #elif CONFIG_CPU == PP5020 |
| 1432 | /* From ipod-ide.c:ipod_ide_register() */ | 1428 | /* From ipod-ide.c:ipod_ide_register() */ |