diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2008-11-09 10:00:52 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2008-11-09 10:00:52 +0000 |
| commit | 9acf856da746ad4ea82f4a8f26acc15e70e35cf3 (patch) | |
| tree | b5ab4b6072328c3e3400ce3d99ab24eab7669241 | |
| parent | e79cacc9d5a7e6a9b7adac108a4be7e474d0b78f (diff) | |
| download | rockbox-9acf856da746ad4ea82f4a8f26acc15e70e35cf3.zip rockbox-9acf856da746ad4ea82f4a8f26acc15e70e35cf3.tar.gz rockbox-9acf856da746ad4ea82f4a8f26acc15e70e35cf3.tar.bz2 rockbox-9acf856da746ad4ea82f4a8f26acc15e70e35cf3.tar.xz | |
AS3525 SD : fix 2nd initialization (in loaded firmware)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19049 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/as3525/ata_sd_as3525.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c index 18cbb13..26208cc 100644 --- a/firmware/target/arm/as3525/ata_sd_as3525.c +++ b/firmware/target/arm/as3525/ata_sd_as3525.c @@ -187,7 +187,6 @@ static int sd_init_card(const int drive) { unsigned int c_size; unsigned long c_mult; - int response; int max_tries = 100; /* max acmd41 attemps */ bool sdhc; @@ -372,11 +371,10 @@ static void init_pl180_controller(const int drive) MMC_CLOCK(drive) = MCI_CLOCK_ENABLE; MMC_CLOCK(drive) &= ~MCI_CLOCK_POWERSAVE; +#else /* controller already initialized by bootloader */ + /* set MCLK divider */ mci_set_clock_divider(drive, 200); -#else - /* controller already initialized by bootloader */ - (void)drive; #endif /* BOOTLOADER */ } @@ -384,6 +382,7 @@ int sd_init(void) { int ret; +#ifdef BOOTLOADER /* No need to do twice the same thing */ CGU_IDE = (1<<7) /* AHB interface enable */ | (1<<6) /* interface enable */ | (2<<2) /* clock didiver = 2+1 */ | @@ -397,6 +396,7 @@ int sd_init(void) CCU_IO &= ~8; /* bits 3:2 = 01, xpd is SD interface */ CCU_IO |= 4; +#endif init_pl180_controller(NAND_AS3525); ret = sd_init_card(NAND_AS3525); if(ret < 0) |