From 0f47ffe0e429c1457e16fddb5f27abc9bf802535 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 2 Jul 2010 06:00:00 +0000 Subject: AMS SoC's: Some register bit changes need interrupt protection: timer API and CGU_PERI. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27236 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/sd-as3525v2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'firmware/target/arm/as3525/sd-as3525v2.c') diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c index 238cd7a5eb..9756d9e1f0 100644 --- a/firmware/target/arm/as3525/sd-as3525v2.c +++ b/firmware/target/arm/as3525/sd-as3525v2.c @@ -708,7 +708,7 @@ int sd_init(void) { int ret; - CGU_PERI |= CGU_MCI_CLOCK_ENABLE; + bitset32(&CGU_PERI, CGU_MCI_CLOCK_ENABLE); CGU_IDE = (1<<7) /* AHB interface enable */ | (AS3525_IDE_DIV << 2) @@ -974,7 +974,7 @@ void sd_enable(bool on) { if (on) { - CGU_PERI |= CGU_MCI_CLOCK_ENABLE; + bitset32(&CGU_PERI, CGU_MCI_CLOCK_ENABLE); CGU_IDE |= (1<<7); /* AHB interface enable */ CGU_MEMSTICK |= (1<<7); /* interface enable */ CGU_SDSLOT |= (1<<7); /* interface enable */ @@ -984,7 +984,7 @@ void sd_enable(bool on) CGU_SDSLOT &= ~(1<<7); /* interface enable */ CGU_MEMSTICK &= ~(1<<7); /* interface enable */ CGU_IDE &= ~(1<<7); /* AHB interface enable */ - CGU_PERI &= ~CGU_MCI_CLOCK_ENABLE; + bitclr32(&CGU_PERI, CGU_MCI_CLOCK_ENABLE); } } -- cgit v1.2.3