aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/atsam/Kconfig5
-rw-r--r--src/atsam/Makefile8
-rw-r--r--src/atsam/sam4s_timer.c118
-rw-r--r--src/atsam/timer.c65
4 files changed, 6 insertions, 190 deletions
diff --git a/src/atsam/Kconfig b/src/atsam/Kconfig
index f4ab2285..2ac185ac 100644
--- a/src/atsam/Kconfig
+++ b/src/atsam/Kconfig
@@ -51,9 +51,8 @@ config MCU
config CLOCK_FREQ
int
- default 42000000 if MACH_SAM3X # 84000000/2
- default 15000000 if MACH_SAM4S # 120000000/8
- default 60000000 if MACH_SAM4E # 120000000/2
+ default 84000000 if MACH_SAM3X
+ default 120000000 if MACH_SAM4
config USBSERIAL
bool "Use USB for communication (instead of serial)"
diff --git a/src/atsam/Makefile b/src/atsam/Makefile
index 894b8198..18c25006 100644
--- a/src/atsam/Makefile
+++ b/src/atsam/Makefile
@@ -31,14 +31,14 @@ CFLAGS_klipper.elf += $(eflags-y) --specs=nano.specs --specs=nosys.specs
# Add source files
src-y += atsam/main.c atsam/gpio.c atsam/i2c.c atsam/spi.c
src-y += generic/crc16_ccitt.c generic/alloc.c
-src-y += generic/armcm_irq.c generic/timer_irq.c
+src-y += generic/armcm_irq.c generic/armcm_timer.c
usbserial-$(CONFIG_MACH_SAM3X) := atsam/sam3_usb.c
usbserial-$(CONFIG_MACH_SAM4) := atsam/sam4_usb.c
src-$(CONFIG_USBSERIAL) += $(usbserial-y) generic/usb_cdc.c
src-$(CONFIG_SERIAL) += atsam/serial.c generic/serial_irq.c
-src-$(CONFIG_MACH_SAM3X) += atsam/adc.c atsam/timer.c
-src-$(CONFIG_MACH_SAM4S) += atsam/adc.c atsam/sam4s_timer.c
-src-$(CONFIG_MACH_SAM4E) += atsam/sam4e_afec.c atsam/timer.c atsam/sam4_cache.c
+src-$(CONFIG_MACH_SAM3X) += atsam/adc.c
+src-$(CONFIG_MACH_SAM4S) += atsam/adc.c
+src-$(CONFIG_MACH_SAM4E) += atsam/sam4e_afec.c atsam/sam4_cache.c
src-$(CONFIG_MACH_SAM3X) += ../lib/sam3x/gcc/system_sam3xa.c
src-$(CONFIG_MACH_SAM3X) += ../lib/sam3x/gcc/gcc/startup_sam3xa.c
src-$(CONFIG_MACH_SAM4S) += atsam/sam4s_sysinit.c
diff --git a/src/atsam/sam4s_timer.c b/src/atsam/sam4s_timer.c
deleted file mode 100644
index a051f08c..00000000
--- a/src/atsam/sam4s_timer.c
+++ /dev/null
@@ -1,118 +0,0 @@
-// SAM4s 16bit timer interrupt scheduling
-//
-// Copyright (C) 2016-2018 Kevin O'Connor <kevin@koconnor.net>
-//
-// This file may be distributed under the terms of the GNU GPLv3 license.
-
-#include "board/io.h" // readl
-#include "board/irq.h" // irq_disable
-#include "board/misc.h" // timer_read_time
-#include "board/timer_irq.h" // timer_dispatch_many
-#include "command.h" // DECL_SHUTDOWN
-#include "internal.h" // TC0
-#include "sched.h" // DECL_INIT
-
-
-/****************************************************************
- * Low level timer code
- ****************************************************************/
-
-// Get the 16bit timer value
-static uint32_t
-timer_get(void)
-{
- return TC0->TC_CHANNEL[0].TC_CV;
-}
-
-// Set the next irq time
-static void
-timer_set(uint32_t value)
-{
- TC0->TC_CHANNEL[0].TC_RA = value;
-}
-
-// Activate timer dispatch as soon as possible
-void
-timer_kick(void)
-{
- timer_set(timer_read_time() + 50);
-}
-
-
-/****************************************************************
- * 16bit hardware timer to 32bit conversion
- ****************************************************************/
-
-// High bits of timer (top 17 bits)
-static uint32_t timer_high;
-
-// Return the current time (in absolute clock ticks).
-uint32_t __always_inline
-timer_read_time(void)
-{
- uint32_t th = readl(&timer_high);
- uint32_t cur = timer_get();
- // Combine timer_high (high 17 bits) and current time (low 16
- // bits) using method that handles rollovers correctly.
- return (th ^ cur) + (th & 0x8000);
-}
-
-// Update timer_high every 0x8000 clock ticks
-static uint_fast8_t
-timer_event(struct timer *t)
-{
- timer_high += 0x8000;
- t->waketime = timer_high + 0x8000;
- return SF_RESCHEDULE;
-}
-static struct timer wrap_timer = {
- .func = timer_event,
- .waketime = 0x8000,
-};
-
-void
-timer_reset(void)
-{
- sched_add_timer(&wrap_timer);
-}
-DECL_SHUTDOWN(timer_reset);
-
-
-/****************************************************************
- * Timer init
- ****************************************************************/
-
-void
-timer_init(void)
-{
- TcChannel *tc = &TC0->TC_CHANNEL[0];
- // Reset the timer
- tc->TC_CCR = TC_CCR_CLKDIS;
- tc->TC_IDR = 0xFFFFFFFF;
- // Enable it
- enable_pclock(ID_TC0);
- tc->TC_CMR = TC_CMR_WAVE | TC_CMR_WAVSEL_UP | TC_CMR_TCCLKS_TIMER_CLOCK2;
- tc->TC_IER = TC_IER_CPAS;
- NVIC_SetPriority(TC0_IRQn, 2);
- NVIC_EnableIRQ(TC0_IRQn);
- timer_kick();
- timer_reset();
- tc->TC_CCR = TC_CCR_CLKEN | TC_CCR_SWTRG;
-}
-DECL_INIT(timer_init);
-
-
-/****************************************************************
- * Main timer dispatch irq handler
- ****************************************************************/
-
-// IRQ handler
-void __visible __aligned(16) // aligning helps stabilize perf benchmarks
-TC0_Handler(void)
-{
- irq_disable();
- uint32_t next = timer_dispatch_many();
- timer_set(next);
- TC0->TC_CHANNEL[0].TC_SR; // read to clear irq pending
- irq_enable();
-}
diff --git a/src/atsam/timer.c b/src/atsam/timer.c
deleted file mode 100644
index b2d600a5..00000000
--- a/src/atsam/timer.c
+++ /dev/null
@@ -1,65 +0,0 @@
-// SAM3/SAM4 timer interrupt scheduling
-//
-// Copyright (C) 2016-2018 Kevin O'Connor <kevin@koconnor.net>
-//
-// This file may be distributed under the terms of the GNU GPLv3 license.
-
-#include "board/irq.h" // irq_disable
-#include "board/misc.h" // timer_read_time
-#include "board/timer_irq.h" // timer_dispatch_many
-#include "command.h" // DECL_SHUTDOWN
-#include "internal.h" // TC0
-#include "sched.h" // DECL_INIT
-
-// Set the next irq time
-static void
-timer_set(uint32_t value)
-{
- TC0->TC_CHANNEL[0].TC_RA = value;
-}
-
-// Return the current time (in absolute clock ticks).
-uint32_t
-timer_read_time(void)
-{
- return TC0->TC_CHANNEL[0].TC_CV;
-}
-
-// Activate timer dispatch as soon as possible
-void
-timer_kick(void)
-{
- timer_set(timer_read_time() + 50);
- TC0->TC_CHANNEL[0].TC_SR; // read to clear irq pending
-}
-
-void
-timer_init(void)
-{
- TcChannel *tc = &TC0->TC_CHANNEL[0];
- // Reset the timer
- tc->TC_CCR = TC_CCR_CLKDIS;
- tc->TC_IDR = 0xFFFFFFFF;
- // Enable it
- enable_pclock(ID_TC0);
- tc->TC_CMR = TC_CMR_WAVE | TC_CMR_WAVSEL_UP | TC_CMR_TCCLKS_TIMER_CLOCK1;
- tc->TC_IER = TC_IER_CPAS;
- NVIC_SetPriority(TC0_IRQn, 2);
- NVIC_EnableIRQ(TC0_IRQn);
- timer_kick();
- tc->TC_CCR = TC_CCR_CLKEN | TC_CCR_SWTRG;
-}
-DECL_INIT(timer_init);
-
-// IRQ handler
-void __visible __aligned(16) // aligning helps stabilize perf benchmarks
-TC0_Handler(void)
-{
- irq_disable();
- uint32_t status = TC0->TC_CHANNEL[0].TC_SR; // read to clear irq pending
- if (likely(status & TC_SR_CPAS)) {
- uint32_t next = timer_dispatch_many();
- timer_set(next);
- }
- irq_enable();
-}
generated by cgit v1.2.3-70-g09d2 (git 2.50.1) at 2025-09-02 09:34:02 +0000