Changeset f4c9e42 in mainline for uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c

Timestamp:

2012-10-15T18:16:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

52fc805

Parents:

e9d636d0

Message:

rootamdm37x: COnvert usbhost cm and core cm to new pio functions.

Fix few incorrect values.

File:

• uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c (modified) (2 diffs)

uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c

@@ -122 +122 @@
         if (on) {
                 /* Enable interface and function clock for USB TLL */
-                device->cm.core->iclken3 |= CORE_CM_ICLKEN3_EN_USBTLL_FLAG;
-                device->cm.core->fclken3 |= CORE_CM_FCLKEN3_EN_USBTLL_FLAG;
+                pio_set_32(&device->cm.core->fclken3,
+                    CORE_CM_FCLKEN3_EN_USBTLL_FLAG, 5);
+                pio_set_32(&device->cm.core->iclken3,
+                    CORE_CM_ICLKEN3_EN_USBTLL_FLAG, 5);
 
                 /* Enable interface and function clock for USB hosts */
-                device->cm.usbhost->iclken |= USBHOST_CM_ICLKEN_EN_USBHOST;
-                device->cm.usbhost->fclken |= USBHOST_CM_FCLKEN_EN_USBHOST1_FLAG;
-                device->cm.usbhost->fclken |= USBHOST_CM_FCLKEN_EN_USBHOST2_FLAG;
+                pio_set_32(&device->cm.usbhost->fclken,
+                    USBHOST_CM_FCLKEN_EN_USBHOST1_FLAG |
+                    USBHOST_CM_FCLKEN_EN_USBHOST2_FLAG, 5);
+                pio_set_32(&device->cm.usbhost->iclken,
+                    USBHOST_CM_ICLKEN_EN_USBHOST, 5);
 #ifdef DEBUG_CM
         printf("DPLL5 (and everything else) should be on: %x %x.\n",
@@ -135 +139 @@
         } else {
                 /* Disable interface and function clock for USB hosts */
-                device->cm.usbhost->fclken &= ~USBHOST_CM_FCLKEN_EN_USBHOST2_FLAG;
-                device->cm.usbhost->fclken &= ~USBHOST_CM_FCLKEN_EN_USBHOST1_FLAG;
-                device->cm.usbhost->iclken &= ~USBHOST_CM_ICLKEN_EN_USBHOST;
+                pio_clear_32(&device->cm.usbhost->iclken,
+                    USBHOST_CM_ICLKEN_EN_USBHOST, 5);
+                pio_clear_32(&device->cm.usbhost->fclken,
+                    USBHOST_CM_FCLKEN_EN_USBHOST1_FLAG |
+                    USBHOST_CM_FCLKEN_EN_USBHOST2_FLAG, 5);
 
                 /* Disable interface and function clock for USB TLL */
-                device->cm.core->fclken3 &= ~CORE_CM_FCLKEN3_EN_USBTLL_FLAG;
-                device->cm.core->iclken3 &= ~CORE_CM_ICLKEN3_EN_USBTLL_FLAG;
+                pio_clear_32(&device->cm.core->iclken3,
+                    CORE_CM_ICLKEN3_EN_USBTLL_FLAG, 5);
+                pio_clear_32(&device->cm.core->fclken3,
+                    CORE_CM_FCLKEN3_EN_USBTLL_FLAG, 5);
         }