1 files changed, 6 insertions, 17 deletions

diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index 292d34eaed54..e78b9df590c0 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -26,8 +26,6 @@
 #include <linux/of_device.h>
 
 #include <linux/mfd/ti_am335x_tscadc.h>
-#include <linux/input/ti_am335x_tsc.h>
-#include <linux/platform_data/ti_am335x_adc.h>
 
 static unsigned int tscadc_readl(struct ti_tscadc_dev *tsadc, unsigned int reg)
 {
@@ -91,31 +89,22 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
         struct ti_tscadc_dev    *tscadc;
         struct resource         *res;
         struct clk              *clk;
-        struct mfd_tscadc_board *pdata = pdev->dev.platform_data;
         struct device_node      *node = pdev->dev.of_node;
         struct mfd_cell         *cell;
         int                     err, ctrl;
         int                     clk_value, clock_rate;
         int                     tsc_wires = 0, adc_channels = 0, total_channels;
 
-        if (!pdata && !pdev->dev.of_node) {
-                dev_err(&pdev->dev, "Could not find platform data\n");
+        if (!pdev->dev.of_node) {
+                dev_err(&pdev->dev, "Could not find valid DT data.\n");
                 return -EINVAL;
         }
 
-        if (pdev->dev.platform_data) {
-                if (pdata->tsc_init)
-                        tsc_wires = pdata->tsc_init->wires;
+        node = of_get_child_by_name(pdev->dev.of_node, "tsc");
+        of_property_read_u32(node, "ti,wires", &tsc_wires);
 
-                if (pdata->adc_init)
-                        adc_channels = pdata->adc_init->adc_channels;
-        } else {
-                node = of_get_child_by_name(pdev->dev.of_node, "tsc");
-                of_property_read_u32(node, "ti,wires", &tsc_wires);
-
-                node = of_get_child_by_name(pdev->dev.of_node, "adc");
-                of_property_read_u32(node, "ti,adc-channels", &adc_channels);
-        }
+        node = of_get_child_by_name(pdev->dev.of_node, "adc");
+        of_property_read_u32(node, "ti,adc-channels", &adc_channels);
 
         total_channels = tsc_wires + adc_channels;