On 23/04/16 20:57, Stefan Wahren wrote:
> Disabling of the touchscreen IRQs should be done in
> mxs_lradc_disable_ts. So disable only the masked virtual channels
> in mxs_lradc_hw_stop and finally remove the unused function
> mxs_lradc_irq_en_mask.
>
> Signed-off-by: Stefan Wahren <stefan.wahren@xxxxxxxx>
> Reviewed-by: Marek Vasut <marex@xxxxxxx>
> Tested-by: Marek Vasut <marex@xxxxxxx>
Applied to the togreg branch of iio.git
Thanks,
Jonathan
> ---
> drivers/iio/adc/mxs-lradc.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c
> index 90242ba..b84d37c 100644
> --- a/drivers/iio/adc/mxs-lradc.c
> +++ b/drivers/iio/adc/mxs-lradc.c
> @@ -373,13 +373,6 @@ static u32 mxs_lradc_plate_mask(struct mxs_lradc *lradc)
> return LRADC_CTRL0_MX28_PLATE_MASK;
> }
>
> -static u32 mxs_lradc_irq_en_mask(struct mxs_lradc *lradc)
> -{
> - if (lradc->soc == IMX23_LRADC)
> - return LRADC_CTRL1_MX23_LRADC_IRQ_EN_MASK;
> - return LRADC_CTRL1_MX28_LRADC_IRQ_EN_MASK;
> -}
> -
> static u32 mxs_lradc_irq_mask(struct mxs_lradc *lradc)
> {
> if (lradc->soc == IMX23_LRADC)
> @@ -1496,7 +1489,9 @@ static void mxs_lradc_hw_stop(struct mxs_lradc *lradc)
> {
> int i;
>
> - mxs_lradc_reg_clear(lradc, mxs_lradc_irq_en_mask(lradc), LRADC_CTRL1);
> + mxs_lradc_reg_clear(lradc,
> + lradc->buffer_vchans << LRADC_CTRL1_LRADC_IRQ_EN_OFFSET,
> + LRADC_CTRL1);
>
> for (i = 0; i < LRADC_MAX_DELAY_CHANS; i++)
> mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(i));
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
