Input: stmpe-ts: preparations for STMPE ADC driver

This patch removes common ADC settings in favor to use
stmpe811_adc_common_init that is present in MFD. This is necessary in
preparation for the stmpe-adc driver, because those two drivers have
common settings for the ADC.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c
index c5d9006588a2facc94529d0b43c8b0bb064dc1b3..cf9c9aa39f6e698ee59ddb5815cd93497519e463 100644 (file)
--- a/drivers/input/touchscreen/stmpe-ts.c
+++ b/drivers/input/touchscreen/stmpe-ts.c
@@ -30,8 +30,6 @@
  * with touchscreen controller
  */
 #define STMPE_REG_INT_STA              0x0B
-#define STMPE_REG_ADC_CTRL1            0x20
-#define STMPE_REG_ADC_CTRL2            0x21
 #define STMPE_REG_TSC_CTRL             0x40
 #define STMPE_REG_TSC_CFG              0x41
 #define STMPE_REG_FIFO_TH              0x4A
@@ -58,15 +56,6 @@
  * @idev: registered input device
  * @work: a work item used to scan the device
  * @dev: a pointer back to the MFD cell struct device*
- * @sample_time: ADC converstion time in number of clock.
- * (0 -> 36 clocks, 1 -> 44 clocks, 2 -> 56 clocks, 3 -> 64 clocks,
- * 4 -> 80 clocks, 5 -> 96 clocks, 6 -> 144 clocks),
- * recommended is 4.
- * @mod_12b: ADC Bit mode (0 -> 10bit ADC, 1 -> 12bit ADC)
- * @ref_sel: ADC reference source
- * (0 -> internal reference, 1 -> external reference)
- * @adc_freq: ADC Clock speed
- * (0 -> 1.625 MHz, 1 -> 3.25 MHz, 2 || 3 -> 6.5 MHz)
  * @ave_ctrl: Sample average control
  * (0 -> 1 sample, 1 -> 2 samples, 2 -> 4 samples, 3 -> 8 samples)
  * @touch_det_delay: Touch detect interrupt delay
@@ -88,10 +77,6 @@ struct stmpe_touch {
        struct input_dev *idev;
        struct delayed_work work;
        struct device *dev;
-       u8 sample_time;
-       u8 mod_12b;
-       u8 ref_sel;
-       u8 adc_freq;
        u8 ave_ctrl;
        u8 touch_det_delay;
        u8 settling;
@@ -192,7 +177,7 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data)
 static int stmpe_init_hw(struct stmpe_touch *ts)
 {
        int ret;
-       u8 adc_ctrl1, adc_ctrl1_mask, tsc_cfg, tsc_cfg_mask;
+       u8 tsc_cfg, tsc_cfg_mask;
        struct stmpe *stmpe = ts->stmpe;
        struct device *dev = ts->dev;
 
@@ -202,22 +187,9 @@ static int stmpe_init_hw(struct stmpe_touch *ts)
                return ret;
        }
 
-       adc_ctrl1 = STMPE_SAMPLE_TIME(ts->sample_time) |
-                   STMPE_MOD_12B(ts->mod_12b) | STMPE_REF_SEL(ts->ref_sel);
-       adc_ctrl1_mask = STMPE_SAMPLE_TIME(0xff) | STMPE_MOD_12B(0xff) |
-                        STMPE_REF_SEL(0xff);
-
-       ret = stmpe_set_bits(stmpe, STMPE_REG_ADC_CTRL1,
-                       adc_ctrl1_mask, adc_ctrl1);
-       if (ret) {
-               dev_err(dev, "Could not setup ADC\n");
-               return ret;
-       }
-
-       ret = stmpe_set_bits(stmpe, STMPE_REG_ADC_CTRL2,
-                       STMPE_ADC_FREQ(0xff), STMPE_ADC_FREQ(ts->adc_freq));
+       ret = stmpe811_adc_common_init(stmpe);
        if (ret) {
-               dev_err(dev, "Could not setup ADC\n");
+               stmpe_disable(stmpe, STMPE_BLOCK_TOUCHSCREEN | STMPE_BLOCK_ADC);
                return ret;
        }
 
@@ -295,13 +267,13 @@ static void stmpe_ts_get_platform_info(struct platform_device *pdev,
 
        if (np) {
                if (!of_property_read_u32(np, "st,sample-time", &val))
-                       ts->sample_time = val;
+                       ts->stmpe->sample_time = val;
                if (!of_property_read_u32(np, "st,mod-12b", &val))
-                       ts->mod_12b = val;
+                       ts->stmpe->mod_12b = val;
                if (!of_property_read_u32(np, "st,ref-sel", &val))
-                       ts->ref_sel = val;
+                       ts->stmpe->ref_sel = val;
                if (!of_property_read_u32(np, "st,adc-freq", &val))
-                       ts->adc_freq = val;
+                       ts->stmpe->adc_freq = val;
                if (!of_property_read_u32(np, "st,ave-ctrl", &val))
                        ts->ave_ctrl = val;
                if (!of_property_read_u32(np, "st,touch-det-delay", &val))