diff options
| author | Luke V <wulfstawulfsta@gmail.com> | 2023-06-16 16:41:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-16 16:41:08 -0400 |
| commit | 9cb2656914ce90745a04048090cf512c7164e821 (patch) | |
| tree | 7086c3521bb766dc689099e8766d4d19c733f40e | |
| parent | 5ee72d320cade30aee62c532fbcac79f66c27258 (diff) | |
| download | kutter-9cb2656914ce90745a04048090cf512c7164e821.tar.gz kutter-9cb2656914ce90745a04048090cf512c7164e821.tar.xz kutter-9cb2656914ce90745a04048090cf512c7164e821.zip | |
atsamd: Fixes for samc21 and compiler optimizations (#6198)
Signed-off-by: Luke Vuksta <wulfstawulfsta@gmail.com>
| -rw-r--r-- | src/atsamd/adc.c | 27 | ||||
| -rw-r--r-- | src/atsamd/fdcan.c | 3 |
2 files changed, 26 insertions, 4 deletions
diff --git a/src/atsamd/adc.c b/src/atsamd/adc.c index a5436982..6590e2f6 100644 --- a/src/atsamd/adc.c +++ b/src/atsamd/adc.c @@ -14,7 +14,9 @@ DECL_ENUMERATION("pin", "ADC_TEMPERATURE", ADC_TEMPERATURE_PIN); #if CONFIG_MACH_SAMC21 -#define ADC_INPUTCTRL_MUXNEG_GND 0x18 +DECL_CONSTANT_STR("RESERVE_PINS_adc", "PA3"); + +#define ADC_INPUTCTRL_MUXNEG_GND ADC_INPUTCTRL_MUXNEG(0x18) #define SAMD51_ADC_SYNC(ADC, BIT) \ while(ADC->SYNCBUSY.reg & ADC_SYNCBUSY_ ## BIT) @@ -94,6 +96,17 @@ adc_init(void) enable_pclock(ADC0_GCLK_ID, ID_ADC0); enable_pclock(ADC1_GCLK_ID, ID_ADC1); + // Set ADC-DAC VREFA pin to ADC mode + gpio_peripheral(GPIO('A', 3), 'B', 0); + + // Reset + ADC0->CTRLA.reg = ADC_CTRLA_SWRST; + while (ADC0->CTRLA.reg & ADC_CTRLA_SWRST) + ; + ADC1->CTRLA.reg = ADC_CTRLA_SWRST; + while (ADC1->CTRLA.reg & ADC_CTRLA_SWRST) + ; + // Load calibration info // ADC0 uint32_t refbuf = GET_FUSE(ADC0_FUSES_BIASREFBUF); @@ -109,16 +122,24 @@ adc_init(void) // Setup and enable // ADC0 - ADC0->REFCTRL.reg = ADC_REFCTRL_REFSEL_INTVCC1; + ADC0->REFCTRL.reg = ADC_REFCTRL_REFSEL_AREFA | ADC_REFCTRL_REFCOMP; ADC0->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV128; ADC0->SAMPCTRL.reg = ADC_SAMPCTRL_SAMPLEN(63); + while (ADC0->SYNCBUSY.reg & ADC_SYNCBUSY_SAMPCTRL) + ; ADC0->CTRLA.reg = ADC_CTRLA_ENABLE; + while (ADC0->SYNCBUSY.reg & ADC_SYNCBUSY_ENABLE) + ; // ADC1 - ADC1->REFCTRL.reg = ADC_REFCTRL_REFSEL_INTVCC1; + ADC1->REFCTRL.reg = ADC_REFCTRL_REFSEL_AREFA | ADC_REFCTRL_REFCOMP; ADC1->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV128; ADC1->SAMPCTRL.reg = ADC_SAMPCTRL_SAMPLEN(63); + while (ADC1->SYNCBUSY.reg & ADC_SYNCBUSY_SAMPCTRL) + ; ADC1->CTRLA.reg = ADC_CTRLA_ENABLE; + while (ADC1->SYNCBUSY.reg & ADC_SYNCBUSY_ENABLE) + ; #elif CONFIG_MACH_SAMD21 // Enable adc clock diff --git a/src/atsamd/fdcan.c b/src/atsamd/fdcan.c index 7c3e6b65..5ad62c0f 100644 --- a/src/atsamd/fdcan.c +++ b/src/atsamd/fdcan.c @@ -119,7 +119,8 @@ canhw_send(struct canbus_msg *msg) txfifo->dlc_section = (msg->dlc & 0x0f) << 16; txfifo->data[0] = msg->data32[0]; txfifo->data[1] = msg->data32[1]; - barrier(); + __DMB(); + CANx->TXBAR.reg; CANx->TXBAR.reg = ((uint32_t)1 << w_index); return CANMSG_DATA_LEN(msg); } |