mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-08 12:45:26 -05:00
AS3525 SD : fix 2nd initialization (in loaded firmware)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19049 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
e79cacc9d5
commit
9acf856da7
1 changed files with 4 additions and 4 deletions
|
|
@ -187,7 +187,6 @@ static int sd_init_card(const int drive)
|
||||||
{
|
{
|
||||||
unsigned int c_size;
|
unsigned int c_size;
|
||||||
unsigned long c_mult;
|
unsigned long c_mult;
|
||||||
|
|
||||||
int response;
|
int response;
|
||||||
int max_tries = 100; /* max acmd41 attemps */
|
int max_tries = 100; /* max acmd41 attemps */
|
||||||
bool sdhc;
|
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_ENABLE;
|
||||||
MMC_CLOCK(drive) &= ~MCI_CLOCK_POWERSAVE;
|
MMC_CLOCK(drive) &= ~MCI_CLOCK_POWERSAVE;
|
||||||
|
|
||||||
|
#else /* controller already initialized by bootloader */
|
||||||
|
|
||||||
/* set MCLK divider */
|
/* set MCLK divider */
|
||||||
mci_set_clock_divider(drive, 200);
|
mci_set_clock_divider(drive, 200);
|
||||||
#else
|
|
||||||
/* controller already initialized by bootloader */
|
|
||||||
(void)drive;
|
|
||||||
#endif /* BOOTLOADER */
|
#endif /* BOOTLOADER */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -384,6 +382,7 @@ int sd_init(void)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
#ifdef BOOTLOADER /* No need to do twice the same thing */
|
||||||
CGU_IDE = (1<<7) /* AHB interface enable */ |
|
CGU_IDE = (1<<7) /* AHB interface enable */ |
|
||||||
(1<<6) /* interface enable */ |
|
(1<<6) /* interface enable */ |
|
||||||
(2<<2) /* clock didiver = 2+1 */ |
|
(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 &= ~8; /* bits 3:2 = 01, xpd is SD interface */
|
||||||
CCU_IO |= 4;
|
CCU_IO |= 4;
|
||||||
|
|
||||||
|
#endif
|
||||||
init_pl180_controller(NAND_AS3525);
|
init_pl180_controller(NAND_AS3525);
|
||||||
ret = sd_init_card(NAND_AS3525);
|
ret = sd_init_card(NAND_AS3525);
|
||||||
if(ret < 0)
|
if(ret < 0)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue