|
@@ -26,7 +26,6 @@
|
|
|
#include <linux/of_device.h>
|
|
|
|
|
|
#include <linux/mfd/ti_am335x_tscadc.h>
|
|
|
-#include <linux/platform_data/ti_am335x_adc.h>
|
|
|
|
|
|
struct tiadc_device {
|
|
|
struct ti_tscadc_dev *mfd_tscadc;
|
|
@@ -153,14 +152,12 @@ static int tiadc_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct iio_dev *indio_dev;
|
|
|
struct tiadc_device *adc_dev;
|
|
|
- struct ti_tscadc_dev *tscadc_dev = ti_tscadc_dev_get(pdev);
|
|
|
- struct mfd_tscadc_board *pdata = tscadc_dev->dev->platform_data;
|
|
|
struct device_node *node = pdev->dev.of_node;
|
|
|
int err;
|
|
|
u32 val32;
|
|
|
|
|
|
- if (!pdata && !node) {
|
|
|
- dev_err(&pdev->dev, "Could not find platform data\n");
|
|
|
+ if (!node) {
|
|
|
+ dev_err(&pdev->dev, "Could not find valid DT data.\n");
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
@@ -174,15 +171,11 @@ static int tiadc_probe(struct platform_device *pdev)
|
|
|
|
|
|
adc_dev->mfd_tscadc = ti_tscadc_dev_get(pdev);
|
|
|
|
|
|
- if (pdata)
|
|
|
- adc_dev->channels = pdata->adc_init->adc_channels;
|
|
|
- else {
|
|
|
- err = of_property_read_u32(node,
|
|
|
- "ti,adc-channels", &val32);
|
|
|
- if (err < 0)
|
|
|
- goto err_free_device;
|
|
|
- adc_dev->channels = val32;
|
|
|
- }
|
|
|
+ err = of_property_read_u32(node,
|
|
|
+ "ti,adc-channels", &val32);
|
|
|
+ if (err < 0)
|
|
|
+ goto err_free_device;
|
|
|
+ adc_dev->channels = val32;
|
|
|
|
|
|
indio_dev->dev.parent = &pdev->dev;
|
|
|
indio_dev->name = dev_name(&pdev->dev);
|