Skip to content

Commit

Permalink
iio: mxs-lradc: move STMP reset out of ADC init
Browse files Browse the repository at this point in the history
This patch moves the STMP reset out of ADC init function so as to remove
the possiblity of an error return which will be necessary for PM ops support
patches to follow.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Tested-by: Marek Vasut <marex@denx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  • Loading branch information
Stefan Wahren authored and Jonathan Cameron committed Apr 19, 2016
1 parent 9cf6fcc commit 850c25c
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions drivers/iio/adc/mxs-lradc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1487,18 +1487,13 @@ static const struct iio_chan_spec mx28_lradc_chan_spec[] = {
MXS_ADC_CHAN(15, IIO_VOLTAGE, "VDD5V"),
};

static int mxs_lradc_hw_init(struct mxs_lradc *lradc)
static void mxs_lradc_hw_init(struct mxs_lradc *lradc)
{
/* The ADC always uses DELAY CHANNEL 0. */
const u32 adc_cfg =
(1 << (LRADC_DELAY_TRIGGER_DELAYS_OFFSET + 0)) |
(LRADC_DELAY_TIMER_PER << LRADC_DELAY_DELAY_OFFSET);

int ret = stmp_reset_block(lradc->base);

if (ret)
return ret;

/* Configure DELAY CHANNEL 0 for generic ADC sampling. */
mxs_lradc_reg_wrt(lradc, adc_cfg, LRADC_DELAY(0));

Expand All @@ -1509,8 +1504,6 @@ static int mxs_lradc_hw_init(struct mxs_lradc *lradc)

/* Start internal temperature sensing. */
mxs_lradc_reg_wrt(lradc, 0, LRADC_CTRL2);

return 0;
}

static void mxs_lradc_hw_stop(struct mxs_lradc *lradc)
Expand Down Expand Up @@ -1710,11 +1703,13 @@ static int mxs_lradc_probe(struct platform_device *pdev)
}
}

/* Configure the hardware. */
ret = mxs_lradc_hw_init(lradc);
ret = stmp_reset_block(lradc->base);
if (ret)
goto err_dev;

/* Configure the hardware. */
mxs_lradc_hw_init(lradc);

/* Register the touchscreen input device. */
if (touch_ret == 0) {
ret = mxs_lradc_ts_register(lradc);
Expand Down

0 comments on commit 850c25c

Please sign in to comment.