Changeset 47f5a77 in mainline for kernel/genarch/src/drivers/am335x/timer.c

Timestamp:

2013-07-17T08:46:06Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a0a4d8

Parents:

cdc3afa (diff), 1d94e21 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• kernel/genarch/src/drivers/am335x/timer.c (modified) (1 diff)

kernel/genarch/src/drivers/am335x/timer.c

@@ -119 +119 @@
         /* Disable compare mode */
         tclr &= ~AM335x_TIMER_TCLR_CE_FLAG;
-        /* Enable the prescaler, divisor = 2 */
-        tclr |= AM335x_TIMER_TCLR_PRE_FLAG;
-        tclr &= ~(AM335x_TIMER_TCLR_PTV_MASK << AM335x_TIMER_TCLR_PTV_SHIFT);
+
         /* Enable auto-reload mode */
         tclr |= AM335x_TIMER_TCLR_AR_FLAG;