iio: mxs-lradc: move TS config into suitable function

This patch moves the touchscreen type configuration into
a more suitable function. Btw this simplifies PM ops later.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Tested-by: Marek Vasut <marex@denx.de>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c
index e4c4c5c8af8309f1bb719cceb5b699f3a65a2946..f8a6c8e1950365288a4f6beb58b9e8f015a0f0ab 100644 (file)
--- a/drivers/iio/adc/mxs-lradc.c
+++ b/drivers/iio/adc/mxs-lradc.c
@@ -686,6 +686,17 @@ static void mxs_lradc_prepare_pressure(struct mxs_lradc *lradc)
 
 static void mxs_lradc_enable_touch_detection(struct mxs_lradc *lradc)
 {
+       /* Configure the touchscreen type */
+       if (lradc->soc == IMX28_LRADC) {
+               mxs_lradc_reg_clear(lradc, LRADC_CTRL0_MX28_TOUCH_SCREEN_TYPE,
+                                   LRADC_CTRL0);
+
+               if (lradc->use_touchscreen == MXS_LRADC_TOUCHSCREEN_5WIRE)
+                       mxs_lradc_reg_set(lradc,
+                                         LRADC_CTRL0_MX28_TOUCH_SCREEN_TYPE,
+                                         LRADC_CTRL0);
+       }
+
        mxs_lradc_setup_touch_detection(lradc);
 
        lradc->cur_plate = LRADC_TOUCH;
@@ -1496,17 +1507,6 @@ static int mxs_lradc_hw_init(struct mxs_lradc *lradc)
        mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(2));
        mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(3));
 
-       /* Configure the touchscreen type */
-       if (lradc->soc == IMX28_LRADC) {
-               mxs_lradc_reg_clear(lradc, LRADC_CTRL0_MX28_TOUCH_SCREEN_TYPE,
-                                   LRADC_CTRL0);
-
-               if (lradc->use_touchscreen == MXS_LRADC_TOUCHSCREEN_5WIRE)
-                       mxs_lradc_reg_set(lradc,
-                                         LRADC_CTRL0_MX28_TOUCH_SCREEN_TYPE,
-                                         LRADC_CTRL0);
-       }
-
        /* Start internal temperature sensing. */
        mxs_lradc_reg_wrt(lradc, 0, LRADC_CTRL2);