Changeset 0f66886 in mainline

Timestamp:

2013-02-13T20:19:29Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

06c4609

Parents:

4c754f6

Message:

fix sysclock frequency reading and print an error message is the operation was unsuccessful

Location:

kernel

Files:

• arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (2 diffs)
• genarch/include/drivers/am335x/ctrl_module.h (modified) (2 diffs)

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

@@ -117 +117 @@
 static void bbone_timer_irq_start(void)
 {
+        unsigned sysclk_freq;
+
         /* Initialize the IRQ */
         static irq_t timer_irq;
@@ -132 +134 @@
            CLK_SRC_M_OSC);
         /* Initialize the DMTIMER2 */
-        am335x_timer_init(&bbone.timer, DMTIMER2, HZ,
-            am335x_ctrl_module_clock_freq_get(bbone.ctrl_module));
+        if (am335x_ctrl_module_clock_freq_get(bbone.ctrl_module,
+            &sysclk_freq) != EOK) {
+                printf("Cannot get the system clock frequency!\n");
+                return;
+        }
+
+        am335x_timer_init(&bbone.timer, DMTIMER2, HZ, sysclk_freq);
         /* Enable the interrupt */
         am335x_irc_enable(bbone.irc_addr, AM335x_DMTIMER2_IRQ);

kernel/genarch/include/drivers/am335x/ctrl_module.h

@@ -37 +37 @@
 #define _KERN_AM335X_CTRL_MODULE_H_
 
+#include <errno.h>
 #include <typedefs.h>
 #include "ctrl_module_regs.h"
@@ -45 +46 @@
 typedef ioport32_t am335x_ctrl_module_t;
 
-static unsigned am335x_ctrl_module_clock_freq_get(am335x_ctrl_module_t *base)
+static int
+am335x_ctrl_module_clock_freq_get(am335x_ctrl_module_t *base, unsigned *freq)
 {
         unsigned const control_status = *AM335x_CTRL_MODULE_REG_ADDR(base,
-            CONTROL_SYSCONFIG);
+            CONTROL_STATUS);
         unsigned const sysboot1 = (control_status >> 22) & 0x03;
 
         switch (sysboot1) {
         default:
+                return EOK;
         case 0:
-                return 19200000; /* 19.2 Mhz */
+                *freq = 19200000; /* 19.2 Mhz */
         case 1:
-                return 24000000; /* 24 Mhz */
+                *freq = 24000000; /* 24 Mhz */
         case 2:
-                return 25000000; /* 25 Mhz */
+                *freq = 25000000; /* 25 Mhz */
         case 3:
-                return 26000000; /* 26 Mhz */
+                *freq = 26000000; /* 26 Mhz */
         }
+
+        return EINVAL;
 }