diff options
| -rw-r--r-- | src/atsamd/Kconfig | 2 | ||||
| -rw-r--r-- | src/atsamd/Makefile | 7 | ||||
| -rw-r--r-- | src/atsamd/samd51_timer.c | 70 |
3 files changed, 4 insertions, 75 deletions
diff --git a/src/atsamd/Kconfig b/src/atsamd/Kconfig index 4d39df60..960e0d6b 100644 --- a/src/atsamd/Kconfig +++ b/src/atsamd/Kconfig @@ -51,7 +51,7 @@ config MCU config CLOCK_FREQ int default 48000000 if MACH_SAMD21 - default 25000000 if MACH_SAMD51 # 200000000/8 + default 120000000 if MACH_SAMD51 choice depends on MACH_SAMD51 diff --git a/src/atsamd/Makefile b/src/atsamd/Makefile index 68a1b539..79a664df 100644 --- a/src/atsamd/Makefile +++ b/src/atsamd/Makefile @@ -21,17 +21,16 @@ CFLAGS_klipper.elf += -T $(OUT)samd.ld --specs=nano.specs --specs=nosys.specs # Add source files src-y += atsamd/main.c atsamd/gpio.c -src-y += generic/crc16_ccitt.c generic/alloc.c -src-y += generic/armcm_irq.c generic/timer_irq.c +src-y += generic/crc16_ccitt.c generic/alloc.c generic/armcm_irq.c src-$(CONFIG_USBSERIAL) += atsamd/usbserial.c generic/usb_cdc.c src-$(CONFIG_SERIAL) += atsamd/serial.c generic/serial_irq.c src-$(CONFIG_HAVE_GPIO_ADC) += atsamd/adc.c src-$(CONFIG_HAVE_GPIO_I2C) += atsamd/i2c.c src-$(CONFIG_HAVE_GPIO_SPI) += atsamd/spi.c src-$(CONFIG_HAVE_GPIO_HARD_PWM) += atsamd/hard_pwm.c -src-$(CONFIG_MACH_SAMD21) += atsamd/clock.c atsamd/timer.c +src-$(CONFIG_MACH_SAMD21) += atsamd/clock.c atsamd/timer.c generic/timer_irq.c src-$(CONFIG_MACH_SAMD21) += ../lib/samd21/samd21a/gcc/gcc/startup_samd21.c -src-$(CONFIG_MACH_SAMD51) += atsamd/samd51_clock.c atsamd/samd51_timer.c +src-$(CONFIG_MACH_SAMD51) += atsamd/samd51_clock.c generic/armcm_timer.c src-$(CONFIG_MACH_SAMD51) += ../lib/samd51/samd51a/gcc/gcc/startup_samd51.c # Support bootloader offset address diff --git a/src/atsamd/samd51_timer.c b/src/atsamd/samd51_timer.c deleted file mode 100644 index 60baf4f4..00000000 --- a/src/atsamd/samd51_timer.c +++ /dev/null @@ -1,70 +0,0 @@ -// SAMD51 timer interrupt scheduling -// -// Copyright (C) 2018-2019 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 "internal.h" // enable_pclock -#include "sched.h" // DECL_INIT - -// Set the next irq time -static void -timer_set(uint32_t value) -{ - TC0->COUNT32.CC[0].reg = value; - TC0->COUNT32.INTFLAG.reg = TC_INTFLAG_MC0; -} - -// Return the current time (in absolute clock ticks). -uint32_t __always_inline -timer_read_time(void) -{ - // Need to request a COUNT update and then delay for it to be ready - TC0->COUNT32.CTRLBSET.reg = TC_CTRLBSET_CMD_READSYNC; - TC0->COUNT32.COUNT.reg; - TC0->COUNT32.COUNT.reg; - return TC0->COUNT32.COUNT.reg; -} - -// Activate timer dispatch as soon as possible -void -timer_kick(void) -{ - timer_set(timer_read_time() + 50); -} - -void -timer_init(void) -{ - // Supply power and clock to the timer - enable_pclock(TC0_GCLK_ID, ID_TC0); - enable_pclock(TC1_GCLK_ID, ID_TC1); - - // Configure the timer - TcCount32 *tc = &TC0->COUNT32; - irqstatus_t flag = irq_save(); - tc->CTRLA.reg = 0; - tc->CTRLA.reg = TC_CTRLA_MODE_COUNT32; - NVIC_SetPriority(TC0_IRQn, 2); - NVIC_EnableIRQ(TC0_IRQn); - tc->INTENSET.reg = TC_INTENSET_MC0; - tc->COUNT.reg = 0; - timer_kick(); - tc->CTRLA.reg = (TC_CTRLA_MODE_COUNT32 | TC_CTRLA_PRESCALER_DIV8 - | TC_CTRLA_ENABLE); - irq_restore(flag); -} -DECL_INIT(timer_init); - -// 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); - irq_enable(); -} |