Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mfd: ti_am335x: Drop am335x_tsc_se_update() from resume path

The update of the SE register in MFD doesn't look right as it has
nothing to do with it. The better place to do it is in TSC driver (which
is already doing it) and in the ADC driver which needs this only in the
continues mode.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Sebastian Andrzej Siewior and committed by
Lee Jones
3954b7bf 7e170c6e

+2 -1
+2
drivers/iio/adc/ti_am335x_adc.c
··· 199 199 tiadc_writel(adc_dev, REG_IRQCLR, (IRQENB_FIFO1THRES | 200 200 IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW)); 201 201 am335x_tsc_se_clr(adc_dev->mfd_tscadc, adc_dev->buffer_en_ch_steps); 202 + adc_dev->buffer_en_ch_steps = 0; 202 203 203 204 /* Flush FIFO of leftover data in the time it takes to disable adc */ 204 205 fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT); ··· 492 491 tiadc_writel(adc_dev, REG_CTRL, restore); 493 492 494 493 tiadc_step_config(indio_dev); 494 + am335x_tsc_se_set(adc_dev->mfd_tscadc, adc_dev->buffer_en_ch_steps); 495 495 496 496 return 0; 497 497 }
-1
drivers/mfd/ti_am335x_tscadc.c
··· 309 309 310 310 if (tscadc_dev->tsc_cell != -1) 311 311 tscadc_idle_config(tscadc_dev); 312 - am335x_tsc_se_update(tscadc_dev); 313 312 restore = tscadc_readl(tscadc_dev, REG_CTRL); 314 313 tscadc_writel(tscadc_dev, REG_CTRL, 315 314 (restore | CNTRLREG_TSCSSENB));