summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/as3525')
-rw-r--r--firmware/target/arm/as3525/sd-as3525.c12
-rw-r--r--firmware/target/arm/as3525/sd-as3525v2.c11
2 files changed, 5 insertions, 18 deletions
diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c
index 9c0b4124ac..8aaae55cf4 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -508,6 +508,8 @@ static void init_pl180_controller(const int drive)
508 GPIOA_IS &= ~EXT_SD_BITS; 508 GPIOA_IS &= ~EXT_SD_BITS;
509 /* detect both raising and falling edges */ 509 /* detect both raising and falling edges */
510 GPIOA_IBE |= EXT_SD_BITS; 510 GPIOA_IBE |= EXT_SD_BITS;
511 /* enable the card detect interrupt */
512 GPIOA_IE |= EXT_SD_BITS;
511 513
512#else 514#else
513 VIC_INT_ENABLE = INTERRUPT_NAND; 515 VIC_INT_ENABLE = INTERRUPT_NAND;
@@ -922,16 +924,6 @@ tCardInfo *card_get_info_target(int card_no)
922 return &card_info[card_no]; 924 return &card_info[card_no];
923} 925}
924 926
925#ifdef HAVE_HOTSWAP
926void card_enable_monitoring_target(bool on)
927{
928 if (on) /* enable interrupt */
929 GPIOA_IE |= EXT_SD_BITS;
930 else /* disable interrupt */
931 GPIOA_IE &= ~EXT_SD_BITS;
932}
933#endif /* HAVE_HOTSWAP */
934
935#endif /* !BOOTLOADER */ 927#endif /* !BOOTLOADER */
936 928
937#ifdef CONFIG_STORAGE_MULTI 929#ifdef CONFIG_STORAGE_MULTI
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index ccc88be25d..1a555e745d 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -731,6 +731,9 @@ int sd_init(void)
731 GPIOA_IS &= ~EXT_SD_BITS; 731 GPIOA_IS &= ~EXT_SD_BITS;
732 /* detect both raising and falling edges */ 732 /* detect both raising and falling edges */
733 GPIOA_IBE |= EXT_SD_BITS; 733 GPIOA_IBE |= EXT_SD_BITS;
734 /* enable the card detect interrupt */
735 GPIOA_IE |= EXT_SD_BITS;
736
734 /* Configure XPD for SD-MCI interface */ 737 /* Configure XPD for SD-MCI interface */
735 CCU_IO |= (1<<2); 738 CCU_IO |= (1<<2);
736#endif 739#endif
@@ -989,14 +992,6 @@ void sd_gpioa_isr(void)
989 /* acknowledge interrupt */ 992 /* acknowledge interrupt */
990 GPIOA_IC = EXT_SD_BITS; 993 GPIOA_IC = EXT_SD_BITS;
991} 994}
992
993void card_enable_monitoring_target(bool on)
994{
995 if (on) /* enable interrupt */
996 GPIOA_IE |= EXT_SD_BITS;
997 else /* disable interrupt */
998 GPIOA_IE &= ~EXT_SD_BITS;
999}
1000#endif /* HAVE_HOTSWAP */ 995#endif /* HAVE_HOTSWAP */
1001 996
1002#ifdef CONFIG_STORAGE_MULTI 997#ifdef CONFIG_STORAGE_MULTI