# HG changeset patch # User asl # Date 1096980678 0 # Node ID bfa08c344743bff7daea9b59dcaf09307557ddfe # Parent 68f7128db71e5659a1669b5ae696eab910d57756 * include/hal_platform_setup.h: added generation of three different clocks for watchdog. diff --git a/packages/hal/arm/at91/jtst/current/ChangeLog b/packages/hal/arm/at91/jtst/current/ChangeLog --- a/packages/hal/arm/at91/jtst/current/ChangeLog +++ b/packages/hal/arm/at91/jtst/current/ChangeLog @@ -1,3 +1,8 @@ +2004-10-4 Andrea Michelotti + + * include/hal_platform_setup.h: added generation of three + different clocks for watchdog. + 2004-06-6 Andrea Michelotti * cdl/hal_arm_at91_jtst.cdl: diff --git a/packages/hal/arm/at91/jtst/current/include/hal_platform_setup.h b/packages/hal/arm/at91/jtst/current/include/hal_platform_setup.h --- a/packages/hal/arm/at91/jtst/current/include/hal_platform_setup.h +++ b/packages/hal/arm/at91/jtst/current/include/hal_platform_setup.h @@ -58,21 +58,28 @@ .macro __pio_clkgen_init ldr r0,=AT91_PIO - ldr r1,=BIT21|BIT22|BIT23|BIT24|BIT25|BIT26|BIT27|BIT3 + ldr r1,=BIT21|BIT22|BIT23|BIT24|BIT25|BIT26|BIT27 str r1,[r0,#AT91_PIO_SODR] // set this bit must be always 1, // otherwise resets - ldr r1,=BIT21|BIT22|BIT23|BIT24|BIT25|BIT26|BIT27|BIT3 + ldr r1,=BIT21|BIT22|BIT23|BIT24|BIT25|BIT26|BIT27 str r1,[r0,#AT91_PIO_OER] // set to output str r1,[r0,#AT91_PIO_PER] // software control ldr r1,=BIT21|BIT22|BIT23|BIT24|BIT25|BIT26|BIT27 str r1,[r0,#AT91_PIO_CODR] // leds all on - ldr r1,=BIT30 - ldr r1,[r0,#AT91_PIO_PDR] // usb interrupt line in - // clockgen 1 is connected to timer ext clk 2 + ldr r1,=BIT30|BIT3 + ldr r1,[r0,#AT91_PIO_PDR] // (BIT30) usb interrupt line in + // (BIT3) active watchdog reset line ldr r0,=AT91_CLKGEN ldr r1,=32 str r1,[r0,#AT91_CLKGEN_CPTMAX0] str r1,[r0,#AT91_CLKGEN_CPTMAX1] + ldr r1,=128 + str r1,[r0,#AT91_CLKGEN_CPTMAX2] //watch dog divider1 + ldr r1,=1024 + str r1,[r0,#AT91_CLKGEN_CPTMAX3] //watch dog divider2 + ldr r1,=2046 + str r1,[r0,#AT91_CLKGEN_CPTMAX4] //watch dog divider3 (max accepted value) + ldr r1,=1 str r1,[r0,#AT91_CLKGEN_CLKENABLE]