Merge tag 'am335x_tsc-adc' of git://breakpoint.cc/bigeasy/linux

A complete refurbished series inclunding:
- DT support for the MFD, TSC and ADC driver & platform device support,
  which has no users, has been killed.
- iio_map from last series is gone and replaced by proper nodes in the
  device tree.
- suspend fixes which means correct data structs are taken and no
  interrupt storm
- fifo split which should problem with TSC & ADC beeing used at the same
  time
- The ADC channels are now checked before blindly applied. That means the
  touch part reads X, Y and Z coordinates and does not mix them up. Same
  goes for the IIO ADC driver.
- The IIO ADC driver now creates files named in_voltageX_raw where X
  represents the ADC line instead of a number starting at 0. A read from
  this file can return -EBUSY in case touch is busy and the ADC didn't
  collect a value.

1 files changed, 203 insertions, 85 deletions

diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 51e7b87827a4..0e9f02aeae6b 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -24,8 +24,9 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <linux/input/ti_am335x_tsc.h>
 #include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 
 #include <linux/mfd/ti_am335x_tscadc.h>
 
@@ -33,6 +34,13 @@
 #define SEQ_SETTLE              275
 #define MAX_12BIT               ((1 << 12) - 1)
 
+static const int config_pins[] = {
+        STEPCONFIG_XPP,
+        STEPCONFIG_XNN,
+        STEPCONFIG_YPP,
+        STEPCONFIG_YNN,
+};
+
 struct titsc {
         struct input_dev        *input;
         struct ti_tscadc_dev    *mfd_tscadc;
@@ -40,7 +48,10 @@ struct titsc {
         unsigned int            wires;
         unsigned int            x_plate_resistance;
         bool                    pen_down;
-        int                     steps_to_configure;
+        int                     coordinate_readouts;
+        u32                     config_inp[4];
+        u32                     bit_xp, bit_xn, bit_yp, bit_yn;
+        u32                     inp_xp, inp_xn, inp_yp, inp_yn;
 };
 
 static unsigned int titsc_readl(struct titsc *ts, unsigned int reg)
@@ -54,92 +65,153 @@ static void titsc_writel(struct titsc *tsc, unsigned int reg,
         writel(val, tsc->mfd_tscadc->tscadc_base + reg);
 }
 
+static int titsc_config_wires(struct titsc *ts_dev)
+{
+        u32 analog_line[4];
+        u32 wire_order[4];
+        int i, bit_cfg;
+
+        for (i = 0; i < 4; i++) {
+                /*
+                 * Get the order in which TSC wires are attached
+                 * w.r.t. each of the analog input lines on the EVM.
+                 */
+                analog_line[i] = (ts_dev->config_inp[i] & 0xF0) >> 4;
+                wire_order[i] = ts_dev->config_inp[i] & 0x0F;
+                if (WARN_ON(analog_line[i] > 7))
+                        return -EINVAL;
+                if (WARN_ON(wire_order[i] > ARRAY_SIZE(config_pins)))
+                        return -EINVAL;
+        }
+
+        for (i = 0; i < 4; i++) {
+                int an_line;
+                int wi_order;
+
+                an_line = analog_line[i];
+                wi_order = wire_order[i];
+                bit_cfg = config_pins[wi_order];
+                if (bit_cfg == 0)
+                        return -EINVAL;
+                switch (wi_order) {
+                case 0:
+                        ts_dev->bit_xp = bit_cfg;
+                        ts_dev->inp_xp = an_line;
+                        break;
+
+                case 1:
+                        ts_dev->bit_xn = bit_cfg;
+                        ts_dev->inp_xn = an_line;
+                        break;
+
+                case 2:
+                        ts_dev->bit_yp = bit_cfg;
+                        ts_dev->inp_yp = an_line;
+                        break;
+                case 3:
+                        ts_dev->bit_yn = bit_cfg;
+                        ts_dev->inp_yn = an_line;
+                        break;
+                }
+        }
+        return 0;
+}
+
 static void titsc_step_config(struct titsc *ts_dev)
 {
         unsigned int    config;
-        int i, total_steps;
-
-        /* Configure the Step registers */
-        total_steps = 2 * ts_dev->steps_to_configure;
+        int i;
+        int end_step;
+        u32 stepenable;
 
         config = STEPCONFIG_MODE_HWSYNC |
-                        STEPCONFIG_AVG_16 | STEPCONFIG_XPP;
+                        STEPCONFIG_AVG_16 | ts_dev->bit_xp;
         switch (ts_dev->wires) {
         case 4:
-                config |= STEPCONFIG_INP_AN2 | STEPCONFIG_XNN;
+                config |= STEPCONFIG_INP(ts_dev->inp_yp) | ts_dev->bit_xn;
                 break;
         case 5:
-                config |= STEPCONFIG_YNN |
-                                STEPCONFIG_INP_AN4 | STEPCONFIG_XNN |
-                                STEPCONFIG_YPP;
+                config |= ts_dev->bit_yn |
+                                STEPCONFIG_INP_AN4 | ts_dev->bit_xn |
+                                ts_dev->bit_yp;
                 break;
         case 8:
-                config |= STEPCONFIG_INP_AN2 | STEPCONFIG_XNN;
+                config |= STEPCONFIG_INP(ts_dev->inp_yp) | ts_dev->bit_xn;
                 break;
         }
 
-        for (i = 1; i <= ts_dev->steps_to_configure; i++) {
+        /* 1 … coordinate_readouts is for X */
+        end_step = ts_dev->coordinate_readouts;
+        for (i = 0; i < end_step; i++) {
                 titsc_writel(ts_dev, REG_STEPCONFIG(i), config);
                 titsc_writel(ts_dev, REG_STEPDELAY(i), STEPCONFIG_OPENDLY);
         }
 
         config = 0;
         config = STEPCONFIG_MODE_HWSYNC |
-                        STEPCONFIG_AVG_16 | STEPCONFIG_YNN |
-                        STEPCONFIG_INM_ADCREFM | STEPCONFIG_FIFO1;
+                        STEPCONFIG_AVG_16 | ts_dev->bit_yn |
+                        STEPCONFIG_INM_ADCREFM;
         switch (ts_dev->wires) {
         case 4:
-                config |= STEPCONFIG_YPP;
+                config |= ts_dev->bit_yp | STEPCONFIG_INP(ts_dev->inp_xp);
                 break;
         case 5:
-                config |= STEPCONFIG_XPP | STEPCONFIG_INP_AN4 |
-                                STEPCONFIG_XNP | STEPCONFIG_YPN;
+                config |= ts_dev->bit_xp | STEPCONFIG_INP_AN4 |
+                                ts_dev->bit_xn | ts_dev->bit_yp;
                 break;
         case 8:
-                config |= STEPCONFIG_YPP;
+                config |= ts_dev->bit_yp | STEPCONFIG_INP(ts_dev->inp_xp);
                 break;
         }
 
-        for (i = (ts_dev->steps_to_configure + 1); i <= total_steps; i++) {
+        /* coordinate_readouts … coordinate_readouts * 2 is for Y */
+        end_step = ts_dev->coordinate_readouts * 2;
+        for (i = ts_dev->coordinate_readouts; i < end_step; i++) {
                 titsc_writel(ts_dev, REG_STEPCONFIG(i), config);
                 titsc_writel(ts_dev, REG_STEPDELAY(i), STEPCONFIG_OPENDLY);
         }
 
-        config = 0;
         /* Charge step configuration */
-        config = STEPCONFIG_XPP | STEPCONFIG_YNN |
+        config = ts_dev->bit_xp | ts_dev->bit_yn |
                         STEPCHARGE_RFP_XPUL | STEPCHARGE_RFM_XNUR |
-                        STEPCHARGE_INM_AN1 | STEPCHARGE_INP_AN1;
+                        STEPCHARGE_INM_AN1 | STEPCHARGE_INP(ts_dev->inp_yp);
 
         titsc_writel(ts_dev, REG_CHARGECONFIG, config);
         titsc_writel(ts_dev, REG_CHARGEDELAY, CHARGEDLY_OPENDLY);
 
-        config = 0;
-        /* Configure to calculate pressure */
+        /* coordinate_readouts * 2 … coordinate_readouts * 2 + 2 is for Z */
         config = STEPCONFIG_MODE_HWSYNC |
-                        STEPCONFIG_AVG_16 | STEPCONFIG_YPP |
-                        STEPCONFIG_XNN | STEPCONFIG_INM_ADCREFM;
-        titsc_writel(ts_dev, REG_STEPCONFIG(total_steps + 1), config);
-        titsc_writel(ts_dev, REG_STEPDELAY(total_steps + 1),
+                        STEPCONFIG_AVG_16 | ts_dev->bit_yp |
+                        ts_dev->bit_xn | STEPCONFIG_INM_ADCREFM |
+                        STEPCONFIG_INP(ts_dev->inp_xp);
+        titsc_writel(ts_dev, REG_STEPCONFIG(end_step), config);
+        titsc_writel(ts_dev, REG_STEPDELAY(end_step),
                         STEPCONFIG_OPENDLY);
 
-        config |= STEPCONFIG_INP_AN3 | STEPCONFIG_FIFO1;
-        titsc_writel(ts_dev, REG_STEPCONFIG(total_steps + 2), config);
-        titsc_writel(ts_dev, REG_STEPDELAY(total_steps + 2),
+        end_step++;
+        config |= STEPCONFIG_INP(ts_dev->inp_yn);
+        titsc_writel(ts_dev, REG_STEPCONFIG(end_step), config);
+        titsc_writel(ts_dev, REG_STEPDELAY(end_step),
                         STEPCONFIG_OPENDLY);
 
-        titsc_writel(ts_dev, REG_SE, STPENB_STEPENB_TC);
+        /* The steps1 … end and bit 0 for TS_Charge */
+        stepenable = (1 << (end_step + 2)) - 1;
+        am335x_tsc_se_set(ts_dev->mfd_tscadc, stepenable);
 }
 
 static void titsc_read_coordinates(struct titsc *ts_dev,
-                                    unsigned int *x, unsigned int *y)
+                u32 *x, u32 *y, u32 *z1, u32 *z2)
 {
         unsigned int fifocount = titsc_readl(ts_dev, REG_FIFO0CNT);
         unsigned int prev_val_x = ~0, prev_val_y = ~0;
         unsigned int prev_diff_x = ~0, prev_diff_y = ~0;
         unsigned int read, diff;
         unsigned int i, channel;
+        unsigned int creads = ts_dev->coordinate_readouts;
 
+        *z1 = *z2 = 0;
+        if (fifocount % (creads * 2 + 2))
+                fifocount -= fifocount % (creads * 2 + 2);
         /*
          * Delta filter is used to remove large variations in sampled
          * values from ADC. The filter tries to predict where the next
@@ -148,32 +220,32 @@ static void titsc_read_coordinates(struct titsc *ts_dev,
          * algorithm compares the difference with that of a present value,
          * if true the value is reported to the sub system.
          */
-        for (i = 0; i < fifocount - 1; i++) {
+        for (i = 0; i < fifocount; i++) {
                 read = titsc_readl(ts_dev, REG_FIFO0);
-                channel = read & 0xf0000;
-                channel = channel >> 0x10;
-                if ((channel >= 0) && (channel < ts_dev->steps_to_configure)) {
-                        read &= 0xfff;
+
+                channel = (read & 0xf0000) >> 16;
+                read &= 0xfff;
+                if (channel < creads) {
                         diff = abs(read - prev_val_x);
                         if (diff < prev_diff_x) {
                                 prev_diff_x = diff;
                                 *x = read;
                         }
                         prev_val_x = read;
-                }
 
-                read = titsc_readl(ts_dev, REG_FIFO1);
-                channel = read & 0xf0000;
-                channel = channel >> 0x10;
-                if ((channel >= ts_dev->steps_to_configure) &&
-                        (channel < (2 * ts_dev->steps_to_configure - 1))) {
-                        read &= 0xfff;
+                } else if (channel < creads * 2) {
                         diff = abs(read - prev_val_y);
                         if (diff < prev_diff_y) {
                                 prev_diff_y = diff;
                                 *y = read;
                         }
                         prev_val_y = read;
+
+                } else if (channel < creads * 2 + 1) {
+                        *z1 = read;
+
+                } else if (channel < creads * 2 + 2) {
+                        *z2 = read;
                 }
         }
 }
@@ -186,23 +258,11 @@ static irqreturn_t titsc_irq(int irq, void *dev)
         unsigned int x = 0, y = 0;
         unsigned int z1, z2, z;
         unsigned int fsm;
-        unsigned int fifo1count, fifo0count;
-        int i;
 
         status = titsc_readl(ts_dev, REG_IRQSTATUS);
         if (status & IRQENB_FIFO0THRES) {
-                titsc_read_coordinates(ts_dev, &x, &y);
 
-                z1 = titsc_readl(ts_dev, REG_FIFO0) & 0xfff;
-                z2 = titsc_readl(ts_dev, REG_FIFO1) & 0xfff;
-
-                fifo1count = titsc_readl(ts_dev, REG_FIFO1CNT);
-                for (i = 0; i < fifo1count; i++)
-                        titsc_readl(ts_dev, REG_FIFO1);
-
-                fifo0count = titsc_readl(ts_dev, REG_FIFO0CNT);
-                for (i = 0; i < fifo0count; i++)
-                        titsc_readl(ts_dev, REG_FIFO0);
+                titsc_read_coordinates(ts_dev, &x, &y, &z1, &z2);
 
                 if (ts_dev->pen_down && z1 != 0 && z2 != 0) {
                         /*
@@ -210,10 +270,10 @@ static irqreturn_t titsc_irq(int irq, void *dev)
                          * Resistance(touch) = x plate resistance *
                          * x postion/4096 * ((z2 / z1) - 1)
                          */
-                        z = z2 - z1;
+                        z = z1 - z2;
                         z *= x;
                         z *= ts_dev->x_plate_resistance;
-                        z /= z1;
+                        z /= z2;
                         z = (z + 2047) >> 12;
 
                         if (z <= MAX_12BIT) {
@@ -248,10 +308,53 @@ static irqreturn_t titsc_irq(int irq, void *dev)
                 irqclr |= IRQENB_PENUP;
         }
 
-        titsc_writel(ts_dev, REG_IRQSTATUS, irqclr);
+        if (status & IRQENB_HW_PEN) {
+
+                titsc_writel(ts_dev, REG_IRQWAKEUP, 0x00);
+                titsc_writel(ts_dev, REG_IRQCLR, IRQENB_HW_PEN);
+        }
 
-        titsc_writel(ts_dev, REG_SE, STPENB_STEPENB_TC);
-        return IRQ_HANDLED;
+        if (irqclr) {
+                titsc_writel(ts_dev, REG_IRQSTATUS, irqclr);
+                am335x_tsc_se_update(ts_dev->mfd_tscadc);
+                return IRQ_HANDLED;
+        }
+        return IRQ_NONE;
+}
+
+static int titsc_parse_dt(struct platform_device *pdev,
+                                        struct titsc *ts_dev)
+{
+        struct device_node *node = pdev->dev.of_node;
+        int err;
+
+        if (!node)
+                return -EINVAL;
+
+        err = of_property_read_u32(node, "ti,wires", &ts_dev->wires);
+        if (err < 0)
+                return err;
+        switch (ts_dev->wires) {
+        case 4:
+        case 5:
+        case 8:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        err = of_property_read_u32(node, "ti,x-plate-resistance",
+                        &ts_dev->x_plate_resistance);
+        if (err < 0)
+                return err;
+
+        err = of_property_read_u32(node, "ti,coordiante-readouts",
+                        &ts_dev->coordinate_readouts);
+        if (err < 0)
+                return err;
+
+        return of_property_read_u32_array(node, "ti,wire-config",
+                        ts_dev->config_inp, ARRAY_SIZE(ts_dev->config_inp));
 }
 
 /*
@@ -262,17 +365,9 @@ static int titsc_probe(struct platform_device *pdev)
 {
         struct titsc *ts_dev;
         struct input_dev *input_dev;
-        struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data;
-        struct mfd_tscadc_board *pdata;
+        struct ti_tscadc_dev *tscadc_dev = ti_tscadc_dev_get(pdev);
         int err;
 
-        pdata = tscadc_dev->dev->platform_data;
-
-        if (!pdata) {
-                dev_err(&pdev->dev, "Could not find platform data\n");
-                return -EINVAL;
-        }
-
         /* Allocate memory for device */
         ts_dev = kzalloc(sizeof(struct titsc), GFP_KERNEL);
         input_dev = input_allocate_device();
@@ -286,9 +381,12 @@ static int titsc_probe(struct platform_device *pdev)
         ts_dev->mfd_tscadc = tscadc_dev;
         ts_dev->input = input_dev;
         ts_dev->irq = tscadc_dev->irq;
-        ts_dev->wires = pdata->tsc_init->wires;
-        ts_dev->x_plate_resistance = pdata->tsc_init->x_plate_resistance;
-        ts_dev->steps_to_configure = pdata->tsc_init->steps_to_configure;
+
+        err = titsc_parse_dt(pdev, ts_dev);
+        if (err) {
+                dev_err(&pdev->dev, "Could not find valid DT data.\n");
+                goto err_free_mem;
+        }
 
         err = request_irq(ts_dev->irq, titsc_irq,
                           0, pdev->dev.driver->name, ts_dev);
@@ -298,8 +396,14 @@ static int titsc_probe(struct platform_device *pdev)
         }
 
         titsc_writel(ts_dev, REG_IRQENABLE, IRQENB_FIFO0THRES);
+        err = titsc_config_wires(ts_dev);
+        if (err) {
+                dev_err(&pdev->dev, "wrong i/p wire configuration\n");
+                goto err_free_irq;
+        }
         titsc_step_config(ts_dev);
-        titsc_writel(ts_dev, REG_FIFO0THR, ts_dev->steps_to_configure);
+        titsc_writel(ts_dev, REG_FIFO0THR,
+                        ts_dev->coordinate_readouts * 2 + 2 - 1);
 
         input_dev->name = "ti-tsc";
         input_dev->dev.parent = &pdev->dev;
@@ -329,11 +433,16 @@ err_free_mem:
 
 static int titsc_remove(struct platform_device *pdev)
 {
-        struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data;
-        struct titsc *ts_dev = tscadc_dev->tsc;
+        struct titsc *ts_dev = platform_get_drvdata(pdev);
+        u32 steps;
 
         free_irq(ts_dev->irq, ts_dev);
 
+        /* total steps followed by the enable mask */
+        steps = 2 * ts_dev->coordinate_readouts + 2;
+        steps = (1 << steps) - 1;
+        am335x_tsc_se_clr(ts_dev->mfd_tscadc, steps);
+
         input_unregister_device(ts_dev->input);
 
         platform_set_drvdata(pdev, NULL);
@@ -344,10 +453,11 @@ static int titsc_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int titsc_suspend(struct device *dev)
 {
-        struct ti_tscadc_dev *tscadc_dev = dev->platform_data;
-        struct titsc *ts_dev = tscadc_dev->tsc;
+        struct titsc *ts_dev = dev_get_drvdata(dev);
+        struct ti_tscadc_dev *tscadc_dev;
         unsigned int idle;
 
+        tscadc_dev = ti_tscadc_dev_get(to_platform_device(dev));
         if (device_may_wakeup(tscadc_dev->dev)) {
                 idle = titsc_readl(ts_dev, REG_IRQENABLE);
                 titsc_writel(ts_dev, REG_IRQENABLE,
@@ -359,9 +469,10 @@ static int titsc_suspend(struct device *dev)
 
 static int titsc_resume(struct device *dev)
 {
-        struct ti_tscadc_dev *tscadc_dev = dev->platform_data;
-        struct titsc *ts_dev = tscadc_dev->tsc;
+        struct titsc *ts_dev = dev_get_drvdata(dev);
+        struct ti_tscadc_dev *tscadc_dev;
 
+        tscadc_dev = ti_tscadc_dev_get(to_platform_device(dev));
         if (device_may_wakeup(tscadc_dev->dev)) {
                 titsc_writel(ts_dev, REG_IRQWAKEUP,
                                 0x00);
@@ -369,7 +480,7 @@ static int titsc_resume(struct device *dev)
         }
         titsc_step_config(ts_dev);
         titsc_writel(ts_dev, REG_FIFO0THR,
-                        ts_dev->steps_to_configure);
+                        ts_dev->coordinate_readouts * 2 + 2 - 1);
         return 0;
 }
 
@@ -382,13 +493,20 @@ static const struct dev_pm_ops titsc_pm_ops = {
 #define TITSC_PM_OPS NULL
 #endif
 
+static const struct of_device_id ti_tsc_dt_ids[] = {
+        { .compatible = "ti,am3359-tsc", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, ti_tsc_dt_ids);
+
 static struct platform_driver ti_tsc_driver = {
         .probe  = titsc_probe,
         .remove = titsc_remove,
         .driver = {
-                .name   = "tsc",
+                .name   = "TI-am335x-tsc",
                 .owner  = THIS_MODULE,
                 .pm     = TITSC_PM_OPS,
+                .of_match_table = of_match_ptr(ti_tsc_dt_ids),
         },
 };
 module_platform_driver(ti_tsc_driver);