diff options
Diffstat (limited to 'firmware/target/arm/as3525/sd-as3525.c')
-rw-r--r-- | firmware/target/arm/as3525/sd-as3525.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c index 4f356c349e..b36c326cb6 100644 --- a/firmware/target/arm/as3525/sd-as3525.c +++ b/firmware/target/arm/as3525/sd-as3525.c | |||
@@ -564,8 +564,7 @@ int sd_init(void) | |||
564 | bitset32(&CGU_PERI, CGU_NAF_CLOCK_ENABLE); | 564 | bitset32(&CGU_PERI, CGU_NAF_CLOCK_ENABLE); |
565 | #ifdef HAVE_MULTIDRIVE | 565 | #ifdef HAVE_MULTIDRIVE |
566 | bitset32(&CGU_PERI, CGU_MCI_CLOCK_ENABLE); | 566 | bitset32(&CGU_PERI, CGU_MCI_CLOCK_ENABLE); |
567 | bitclr32(&CCU_IO, 1<<3); /* bits 3:2 = 01, xpd is SD interface */ | 567 | bitmod32(&CCU_IO, 1<<2, 3<<2); /* bits 3:2 = 01, xpd is SD interface */ |
568 | bitset32(&CCU_IO, 1<<2); | ||
569 | #endif | 568 | #endif |
570 | 569 | ||
571 | semaphore_init(&transfer_completion_signal, 1, 0); | 570 | semaphore_init(&transfer_completion_signal, 1, 0); |
@@ -970,7 +969,7 @@ void sd_enable(bool on) | |||
970 | #if defined(HAVE_BUTTON_LIGHT) && defined(HAVE_MULTIDRIVE) | 969 | #if defined(HAVE_BUTTON_LIGHT) && defined(HAVE_MULTIDRIVE) |
971 | /* buttonlight AMSes need a bit of special handling for the buttonlight | 970 | /* buttonlight AMSes need a bit of special handling for the buttonlight |
972 | * here due to the dual mapping of GPIOD and XPD */ | 971 | * here due to the dual mapping of GPIOD and XPD */ |
973 | bitset32(&CCU_IO, 1<<2); /* XPD is SD-MCI interface (b3:2 = 01) */ | 972 | bitmod32(&CCU_IO, 1<<2, 3<<2); /* XPD is SD-MCI interface (b3:2 = 01) */ |
974 | if (buttonlight_is_on) | 973 | if (buttonlight_is_on) |
975 | GPIOD_DIR &= ~(1<<7); | 974 | GPIOD_DIR &= ~(1<<7); |
976 | else | 975 | else |
@@ -996,7 +995,7 @@ void sd_enable(bool on) | |||
996 | #endif /* defined(HAVE_HOTSWAP) && defined (HAVE_ADJUSTABLE_CPU_VOLTAGE) */ | 995 | #endif /* defined(HAVE_HOTSWAP) && defined (HAVE_ADJUSTABLE_CPU_VOLTAGE) */ |
997 | 996 | ||
998 | #if defined(HAVE_BUTTON_LIGHT) && defined(HAVE_MULTIDRIVE) | 997 | #if defined(HAVE_BUTTON_LIGHT) && defined(HAVE_MULTIDRIVE) |
999 | bitclr32(&CCU_IO, 1<<2); /* XPD is general purpose IO (b3:2 = 00) */ | 998 | bitmod32(&CCU_IO, 0<<2, 3<<2); /* XPD is general purpose IO (b3:2 = 00) */ |
1000 | if (buttonlight_is_on) | 999 | if (buttonlight_is_on) |
1001 | _buttonlight_on(); | 1000 | _buttonlight_on(); |
1002 | #endif | 1001 | #endif |