[PATCH 3/3] ti_tscadc: Deal with non activation of all the devices.

[Pantelis Antoniou]

It's common not for both the touchscreen & adc to be activated
at the same time. Deal with this case.

Signed-off-by: Pantelis Antoniou <pa...@antoniou-consulting.com>
---
 drivers/mfd/ti_am335x_tscadc.c       | 34 +++++++++++++++++++++++-----------
 include/linux/mfd/ti_am335x_tscadc.h |  8 +++-----
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index e947dd8..97eb4f7 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -68,7 +68,7 @@ static        int __devinit ti_tscadc_probe(struct 
platform_device *pdev)
        int                     irq;
        int                     err, ctrl;
        int                     clk_value, clock_rate;
-       int                     tsc_wires, adc_channels = 0, total_channels;
+       int                     tsc_wires = 0, adc_channels = 0, total_channels;
 
        if (!pdata) {
                dev_err(&pdev->dev, "Could not find platform data\n");
@@ -78,7 +78,9 @@ static        int __devinit ti_tscadc_probe(struct 
platform_device *pdev)
        if (pdata->adc_init)
                adc_channels = pdata->adc_init->adc_channels;
 
-       tsc_wires = pdata->tsc_init->wires;
+       if (pdata->tsc_init)
+               tsc_wires = pdata->tsc_init->wires;
+
        total_channels = tsc_wires + adc_channels;
 
        if (total_channels > 8) {
@@ -176,20 +178,30 @@ static    int __devinit ti_tscadc_probe(struct 
platform_device *pdev)
        ctrl |= CNTRLREG_TSCSSENB;
        tscadc_writel(tscadc, REG_CTRL, ctrl);
 
+       tscadc->used_cells = 0;
+       tscadc->tsc_cell = -1;
+       tscadc->adc_cell = -1;
+
        /* TSC Cell */
-       cell = &tscadc->cells[TSC_CELL];
-       cell->name = "tsc";
-       cell->platform_data = tscadc;
-       cell->pdata_size = sizeof(*tscadc);
+       if (tsc_wires > 0) {
+               tscadc->tsc_cell = tscadc->used_cells;
+               cell = &tscadc->cells[tscadc->used_cells++];
+               cell->name = "tsc";
+               cell->platform_data = tscadc;
+               cell->pdata_size = sizeof(*tscadc);
+       }
 
        /* ADC Cell */
-       cell = &tscadc->cells[ADC_CELL];
-       cell->name = "tiadc";
-       cell->platform_data = tscadc;
-       cell->pdata_size = sizeof(*tscadc);
+       if (adc_channels > 0) {
+               tscadc->adc_cell = tscadc->used_cells;
+               cell = &tscadc->cells[tscadc->used_cells++];
+               cell->name = "tiadc";
+               cell->platform_data = tscadc;
+               cell->pdata_size = sizeof(*tscadc);
+       }
 
        err = mfd_add_devices(&pdev->dev, pdev->id, tscadc->cells,
-                       TSCADC_CELLS, NULL, 0, NULL);
+                       tscadc->used_cells, NULL, 0, NULL);
        if (err < 0)
                goto err_disable_clk;
 
diff --git a/include/linux/mfd/ti_am335x_tscadc.h 
b/include/linux/mfd/ti_am335x_tscadc.h
index 9624fea..50a245f 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -128,11 +128,6 @@
 
 #define TSCADC_CELLS           2
 
-enum tscadc_cells {
-       TSC_CELL,
-       ADC_CELL,
-};
-
 struct mfd_tscadc_board {
        struct tsc_data *tsc_init;
        struct adc_data *adc_init;
@@ -143,6 +138,9 @@ struct ti_tscadc_dev {
        struct regmap *regmap_tscadc;
        void __iomem *tscadc_base;
        int irq;
+       int used_cells; /* 0-2 */
+       int tsc_cell;   /* -1 if not used */
+       int adc_cell;   /* -1 if not used */
        struct mfd_cell cells[TSCADC_CELLS];
 
        /* tsc device */
-- 
1.7.12

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html