summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525/usb-drv-as3525.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-07-02 06:00:00 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-07-02 06:00:00 +0000
commit0f47ffe0e429c1457e16fddb5f27abc9bf802535 (patch)
tree6dc6c22865f35b43b7fc0e1dab168ac2f170f965 /firmware/target/arm/as3525/usb-drv-as3525.c
parent9d6851688e018b50e296756beffc9ced97b72df0 (diff)
downloadrockbox-0f47ffe0e429c1457e16fddb5f27abc9bf802535.tar.gz
rockbox-0f47ffe0e429c1457e16fddb5f27abc9bf802535.zip
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
Diffstat (limited to 'firmware/target/arm/as3525/usb-drv-as3525.c')
-rw-r--r--firmware/target/arm/as3525/usb-drv-as3525.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c
index 88ebf671ec..f98db62596 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525.c
@@ -236,7 +236,7 @@ void usb_drv_init(void)
236 ascodec_write(AS3514_CVDD_DCDC3, ascodec_read(AS3514_CVDD_DCDC3) | 1<<2); 236 ascodec_write(AS3514_CVDD_DCDC3, ascodec_read(AS3514_CVDD_DCDC3) | 1<<2);
237 237
238 /* AHB part */ 238 /* AHB part */
239 CGU_PERI |= CGU_USB_CLOCK_ENABLE; 239 bitset32(&CGU_PERI, CGU_USB_CLOCK_ENABLE);
240 240
241 /* reset AHB */ 241 /* reset AHB */
242 CCU_SRC = CCU_SRC_USB_AHB_EN; 242 CCU_SRC = CCU_SRC_USB_AHB_EN;
@@ -319,7 +319,7 @@ void usb_drv_exit(void)
319 USB_DEV_INTR_MASK = 0xffffffff; 319 USB_DEV_INTR_MASK = 0xffffffff;
320 VIC_INT_EN_CLEAR = INTERRUPT_USB; 320 VIC_INT_EN_CLEAR = INTERRUPT_USB;
321 CGU_USB &= ~(1<<5); 321 CGU_USB &= ~(1<<5);
322 CGU_PERI &= ~CGU_USB_CLOCK_ENABLE; 322 bitclr32(&CGU_PERI, CGU_USB_CLOCK_ENABLE);
323 /* Disable UVDD generating LDO */ 323 /* Disable UVDD generating LDO */
324 ascodec_write(AS3515_USB_UTIL, ascodec_read(AS3515_USB_UTIL) & ~(1<<4)); 324 ascodec_write(AS3515_USB_UTIL, ascodec_read(AS3515_USB_UTIL) & ~(1<<4));
325 usb_disable_pll(); 325 usb_disable_pll();