Skip to content

F
FMC TDC 1ns 5cha - Software
Commit b4a073d2 authored by Samuel Iglesias Gonsálvez's avatar Samuel Iglesias Gonsálvez
Browse files
Options

tdc: change return value to tdc_activate_acquisition 

Signed-off-by: Samuel Iglesias Gonsálvez's avatarSamuel Iglesias Gonsálvez <siglesias@igalia.com>
parent e2a0960f
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
drivers/tdc-core.c
View file @ b4a073d2
...@@ -75,22 +75,22 @@ void tdc_clear_da_capo_flag(struct spec_tdc *tdc) ...@@ -75,22 +75,22 @@ void tdc_clear_da_capo_flag(struct spec_tdc *tdc)
writel(TDC_CTRL_CLEAR_DACAPO_FLAG, tdc->base + TDC_CTRL_REG); writel(TDC_CTRL_CLEAR_DACAPO_FLAG, tdc->base + TDC_CTRL_REG);
} }
void tdc_activate_acquisition(struct spec_tdc *tdc) int tdc_activate_acquisition(struct spec_tdc *tdc)
{ {
u32 acam_status_test; u32 acam_status_test;
/* Before activate the adquisition is required to reset the ACAM chip */ /* Before activate the adquisition is required to reset the ACAM chip */
tdc_acam_reset(tdc); tdc_acam_reset(tdc);
acam_status_test = tdc_acam_status(tdc)-0xC4000800; acam_status_test = tdc_acam_status(tdc)-0xC4000800;
if (acam_status_test == 0) if (acam_status_test != 0) {
pr_err( "ACAM status OK! 0x%x\n", acam_status_test); pr_err( "ACAM status not ready! 0x%x\n", acam_status_test);
else return -EBUSY;
pr_err( "ACAM status Not OK! 0x%x\n", acam_status_test + 0xC4000800); }
/* Enable IRQ */ /* Enable IRQ */
writel(0xC, tdc->base + TDC_IRQ_REG + 0x8); writel(0xC, tdc->base + TDC_IRQ_REG + 0x8);
writel(TDC_CTRL_EN_ACQ, tdc->base + TDC_CTRL_REG); writel(TDC_CTRL_EN_ACQ, tdc->base + TDC_CTRL_REG);
return 0;
} }
void tdc_deactivate_acquisition(struct spec_tdc *tdc) void tdc_deactivate_acquisition(struct spec_tdc *tdc)
......
drivers/tdc-zio.c
View file @ b4a073d2
...@@ -139,7 +139,7 @@ static int tdc_zio_conf_set(struct device *dev, ...@@ -139,7 +139,7 @@ static int tdc_zio_conf_set(struct device *dev,
case TDC_ATTR_DEV_ACTIVATE_ACQUISITION: case TDC_ATTR_DEV_ACTIVATE_ACQUISITION:
if (usr_val) { if (usr_val) {
atomic_set(&tdc->busy, 1); atomic_set(&tdc->busy, 1);
tdc_activate_acquisition(tdc); return tdc_activate_acquisition(tdc);
} else { } else {
atomic_set(&tdc->busy, 0); atomic_set(&tdc->busy, 0);
tdc_deactivate_acquisition(tdc); tdc_deactivate_acquisition(tdc);
......
drivers/tdc.h
View file @ b4a073d2
...@@ -106,7 +106,7 @@ extern u32 tdc_get_circular_buffer_wr_pointer(struct spec_tdc *tdc); ...@@ -106,7 +106,7 @@ extern u32 tdc_get_circular_buffer_wr_pointer(struct spec_tdc *tdc);
extern u32 tdc_get_dac_word(struct spec_tdc *tdc); extern u32 tdc_get_dac_word(struct spec_tdc *tdc);
extern void tdc_clear_da_capo_flag(struct spec_tdc *tdc); extern void tdc_clear_da_capo_flag(struct spec_tdc *tdc);
extern void tdc_activate_acquisition(struct spec_tdc *tdc); extern int tdc_activate_acquisition(struct spec_tdc *tdc);
extern void tdc_deactivate_acquisition(struct spec_tdc *tdc); extern void tdc_deactivate_acquisition(struct spec_tdc *tdc);
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment