Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit 1cd3faf4 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw:drv: improve dmesg output 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 90973d2c
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
kernel/fa-core.c
View file @ 1cd3faf4
...@@ -353,13 +353,13 @@ int zfad_fsm_command(struct fa_dev *fa, uint32_t command) ...@@ -353,13 +353,13 @@ int zfad_fsm_command(struct fa_dev *fa, uint32_t command)
return -EIO; return -EIO;
} }
dev_dbg(fa->msgdev, "FSM START Command, Enable interrupts\n"); dev_dbg(fa->msgdev, "FSM START Command\n");
fa_enable_irqs(fa); fa_enable_irqs(fa);
fa_writel(fa, fa->fa_adc_csr_base, fa_writel(fa, fa->fa_adc_csr_base,
&zfad_regs[ZFA_CTL_RST_TRG_STA], 1); &zfad_regs[ZFA_CTL_RST_TRG_STA], 1);
} else { } else {
dev_dbg(fa->msgdev, "FSM STOP Command, Disable interrupts\n"); dev_dbg(fa->msgdev, "FSM STOP Command\n");
fa->enable_auto_start = 0; fa->enable_auto_start = 0;
fa_disable_irqs(fa); fa_disable_irqs(fa);
} }
......
kernel/fa-irq.c
View file @ 1cd3faf4
...@@ -65,9 +65,9 @@ irqreturn_t fa_irq_handler(int irq, void *arg) ...@@ -65,9 +65,9 @@ irqreturn_t fa_irq_handler(int irq, void *arg)
if (!status) if (!status)
return IRQ_NONE; /* No interrupt fired by this mezzanine */ return IRQ_NONE; /* No interrupt fired by this mezzanine */
dev_dbg(fa->msgdev, "Handle ADC interrupts\n");
if (status & FA_IRQ_ADC_ACQ_END) { if (status & FA_IRQ_ADC_ACQ_END) {
dev_dbg(fa->msgdev, "Handle ADC interrupts\n");
/* /*
* Acquiring samples is a critical section * Acquiring samples is a critical section
* protected against any concurrent abbort trigger. * protected against any concurrent abbort trigger.
...@@ -142,8 +142,6 @@ int fa_free_irqs(struct fa_dev *fa) ...@@ -142,8 +142,6 @@ int fa_free_irqs(struct fa_dev *fa)
int fa_enable_irqs(struct fa_dev *fa) int fa_enable_irqs(struct fa_dev *fa)
{ {
dev_dbg(fa->msgdev, "Enable interrupts\n");
fa_writel(fa, fa->fa_irq_adc_base, fa_writel(fa, fa->fa_irq_adc_base,
&zfad_regs[ZFA_IRQ_ADC_ENABLE_MASK], &zfad_regs[ZFA_IRQ_ADC_ENABLE_MASK],
FA_IRQ_ADC_ACQ_END); FA_IRQ_ADC_ACQ_END);
...@@ -152,8 +150,6 @@ int fa_enable_irqs(struct fa_dev *fa) ...@@ -152,8 +150,6 @@ int fa_enable_irqs(struct fa_dev *fa)
int fa_disable_irqs(struct fa_dev *fa) int fa_disable_irqs(struct fa_dev *fa)
{ {
dev_dbg(fa->msgdev, "Disable interrupts\n");
fa_writel(fa, fa->fa_irq_adc_base, fa_writel(fa, fa->fa_irq_adc_base,
&zfad_regs[ZFA_IRQ_ADC_DISABLE_MASK], &zfad_regs[ZFA_IRQ_ADC_DISABLE_MASK],
FA_IRQ_ADC_ACQ_END); FA_IRQ_ADC_ACQ_END);
......
kernel/spi.c
View file @ 1cd3faf4
...@@ -50,7 +50,8 @@ int fa_spi_xfer(struct fa_dev *fa, int cs, int num_bits, ...@@ -50,7 +50,8 @@ int fa_spi_xfer(struct fa_dev *fa, int cs, int num_bits,
while (fa_ioread(fa, fa->fa_spi_base + FA_SPI_CTRL) while (fa_ioread(fa, fa->fa_spi_base + FA_SPI_CTRL)
& FA_SPI_CTRL_BUSY) { & FA_SPI_CTRL_BUSY) {
if (jiffies > j) { if (jiffies > j) {
dev_err(fa->msgdev, "SPI transfer error\n"); dev_err(fa->msgdev, "SPI transfer error cs:%d, ctrl: 0x%x\n",
cs, fa_ioread(fa, fa->fa_spi_base + FA_SPI_CTRL));
err = -EIO; err = -EIO;
goto out; goto out;
} }
......
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