3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pru: Move peripheral init from pru0 to pru1 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2017-07-12 20:02:23 -04:00
parent c105ff1c51
commit 3ac60b31a2
3 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/pru/adc.c
View File

@ -18,14 +18,46 @@
DECL_CONSTANT(ADC_MAX, 4095);
static void
adc_full_reset(void)
{
static uint8_t have_done_reset;
if (have_done_reset)
return;
have_done_reset = 1;
// Disable ADC
ADC->ctrl = (1<<2);
barrier();
// Clear registers
ADC->irqstatus = 0xffffffff;
ADC->irqenable_clr = 0xffffffff;
ADC->dmaenable_clr = 0xffffffff;
ADC->adc_clkdiv = 0;
ADC->stepenable = 0;
ADC->idleconfig = 0;
int i;
for (i=0; i<8; i++) {
ADC->step[i].config = i<<19;
ADC->step[i].delay = 0;
}
// Enable ADC
writel(&ADC->ctrl, 0x07);
// Drain fifo
while (readl(&ADC->fifo0count))
readl(&ADC->fifo0data);
if (!readl(&ADC->ctrl))
shutdown("ADC module not enabled");
}
struct gpio_adc
gpio_adc_setup(uint8_t pin)
{
uint8_t chan = pin - 4 * 32;
if (chan >= 8)
shutdown("Not an adc channel");
if (!readl(&ADC->ctrl))
shutdown("ADC module not enabled");
adc_full_reset();
return (struct gpio_adc){ .chan = chan };
}

2
src/pru/main.c
View File

@ -89,6 +89,8 @@ DECL_SHUTDOWN(timer_shutdown);
void
timer_init(void)
{
CT_IEP.TMR_CMP_CFG = 0x01 << 1;
CT_IEP.TMR_GLB_CFG = 0x11;
CT_IEP.TMR_CNT = 0;
timer_shutdown();
}

44
src/pru/pru0.c
View File

@ -9,7 +9,6 @@
#include <string.h> // memset
#include <pru/io.h> // write_r31
#include <pru_cfg.h> // CT_CFG
#include <pru_iep.h> // CT_IEP
#include <pru_intc.h> // CT_INTC
#include <pru_rpmsg.h> // pru_rpmsg_send
#include <pru_virtio_ids.h> // VIRTIO_ID_RPMSG
@ -187,43 +186,6 @@ console_sendf(const struct command_encoder *ce, va_list args)
}
/****************************************************************
* Peripheral reset
****************************************************************/
static void
timer_reset(void)
{
CT_IEP.TMR_CMP_CFG = 0x01 << 1;
CT_IEP.TMR_GLB_CFG = 0x11;
}
static void
adc_reset(void)
{
// Disable ADC
ADC->ctrl = (1<<2);
barrier();
// Clear registers
ADC->irqstatus = 0xffffffff;
ADC->irqenable_clr = 0xffffffff;
ADC->dmaenable_clr = 0xffffffff;
ADC->adc_clkdiv = 0;
ADC->stepenable = 0;
ADC->idleconfig = 0;
int i;
for (i=0; i<8; i++) {
ADC->step[i].config = i<<19;
ADC->step[i].delay = 0;
}
// Enable ADC
writel(&ADC->ctrl, 0x07);
// Drain fifo
while (readl(&ADC->fifo0count))
readl(&ADC->fifo0data);
}
/****************************************************************
* Resource table
****************************************************************/
@ -365,12 +327,8 @@ main(void)
, CHAN_DESC, CHAN_PORT) != PRU_RPMSG_SUCCESS)
;
// Reset peripherals
memset(SHARED_MEM, 0, sizeof(*SHARED_MEM));
timer_reset();
adc_reset();
// Wait for PRU1 to be ready
memset(SHARED_MEM, 0, sizeof(*SHARED_MEM));
writel(&SHARED_MEM->signal, SIGNAL_PRU0_WAITING);
while (readl(&SHARED_MEM->signal) != SIGNAL_PRU1_READY)
;