summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2009-03-22 01:50:48 +0000
committerMichael Sevakis <jethead71@rockbox.org>2009-03-22 01:50:48 +0000
commitb7f7655dc2ae979fee8b01ed894224e5c2f7c719 (patch)
tree6540a83276514c2ea27b9c633ac9872588e126be /firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
parent6a76ebbab10594f425edbd26e1fa35b0e37a61e5 (diff)
downloadrockbox-b7f7655dc2ae979fee8b01ed894224e5c2f7c719.tar.gz
rockbox-b7f7655dc2ae979fee8b01ed894224e5c2f7c719.tar.bz2
rockbox-b7f7655dc2ae979fee8b01ed894224e5c2f7c719.zip
imx31/mc13783: Do some housekeeping with register macros, function names and other defines. No functional changes (except to alter a couple int priorities).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20442 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s/usb-imx31.c')
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/usb-imx31.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c b/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
index 8682cff7c7..2011d0c633 100644
--- a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
@@ -89,7 +89,7 @@ void usb_enable(bool on)
{
/* Module clock should be on since since this could be called with
* OFF initially and writing module registers would hardlock otherwise. */
- imx31_clkctl_module_clock_gating(CG_USBOTG, CGM_ON_ALL);
+ ccm_module_clock_gating(CG_USBOTG, CGM_ON_RUN_WAIT);
enable_transceiver(true);
if (on)
@@ -100,7 +100,7 @@ void usb_enable(bool on)
{
usb_core_exit();
enable_transceiver(false);
- imx31_clkctl_module_clock_gating(CG_USBOTG, CGM_OFF);
+ ccm_module_clock_gating(CG_USBOTG, CGM_OFF);
}
}
@@ -117,9 +117,14 @@ static void __attribute__((interrupt("IRQ"))) USB_OTG_HANDLER(void)
void usb_drv_int_enable(bool enable)
{
if (enable)
- avic_enable_int(USB_OTG, IRQ, 7, USB_OTG_HANDLER);
- else
- avic_disable_int(USB_OTG);
+ {
+ avic_enable_int(INT_USB_OTG, INT_TYPE_IRQ, INT_PRIO_DEFAULT,
+ USB_OTG_HANDLER);
+ }
+ else
+ {
+ avic_disable_int(INT_USB_OTG);
+ }
}
/* Called during the bus reset interrupt when in detect mode */