Changeset d1714e8 in mainline

Timestamp:

2012-03-13T04:15:28Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2df8561

Parents:

08d059a

Message:

beagleboardxm,amdm37x: Move clock select to timer initialization routine.

Add comment about temporary variables.

Location:

kernel

Files:

• arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (1 diff)
• genarch/include/drivers/amdm37x_gpt/amdm37x_gpt.h (modified) (2 diffs)

kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

@@ -101 +101 @@
         amdm37x_irc_init(beagleboard.irc_addr);
 
-        // TODO find a nicer way to setup 32kHz clock source for timer1
-        ioport32_t *clksel = (void*) km_map(0x48004C40, 4, PAGE_NOT_CACHEABLE);
-        *clksel &= ~1;
-        km_unmap((uintptr_t)clksel, 4);
-
         /* Initialize timer, pick timer1, because it is in always-power domain
          * and has special capabilities for regular ticks */

kernel/genarch/include/drivers/amdm37x_gpt/amdm37x_gpt.h

@@ -198 +198 @@
     amdm37x_gpt_t* timer, uintptr_t ioregs, size_t iosize, unsigned hz)
 {
+        /* Set 32768 Hz clock as source */
+        // TODO find a nicer way to setup 32kHz clock source for timer1
+        // reg 0x48004C40 is CM_CLKSEL_WKUP see page 485 of the manual
+        ioport32_t *clksel = (void*) km_map(0x48004C40, 4, PAGE_NOT_CACHEABLE);
+        *clksel &= ~1;
+        km_unmap((uintptr_t)clksel, 4);
+
         ASSERT(timer);
         /* Map control register */
@@ -213 +220 @@
         if (timer->special_available) {
                 /* Set values for according to formula (manual p. 2733) */
+                /* Use temporary variables for easier debugging */
                 const uint32_t tpir =
                     ((32768 / hz + 1) * 1000000) - (32768000L * (1000 / hz));