hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mfd: ti_am335x_tscadc: remove platform_data support 

This patch removes access to platform data mfd_tscadc_board because the
platform is DT only.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
This commit is contained in:
Sebastian Andrzej Siewior 2013-05-21 17:56:49 +02:00
parent a6543a1cb5
commit 9e5775f312
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mfd/ti_am335x_tscadc.c
View File

@ -26,8 +26,6 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/mfd/ti_am335x_tscadc.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) 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 ti_tscadc_dev *tscadc;
struct resource *res; struct resource *res;
struct clk *clk; struct clk *clk;
struct mfd_tscadc_board *pdata = pdev->dev.platform_data;
struct device_node *node = pdev->dev.of_node; struct device_node *node = pdev->dev.of_node;
struct mfd_cell *cell; struct mfd_cell *cell;
int err, ctrl; int err, ctrl;
int clk_value, clock_rate; int clk_value, clock_rate;
int tsc_wires = 0, adc_channels = 0, total_channels; int tsc_wires = 0, adc_channels = 0, total_channels;
if (!pdata && !pdev->dev.of_node) { if (!pdev->dev.of_node) {
dev_err(&pdev->dev, "Could not find platform data\n"); dev_err(&pdev->dev, "Could not find valid DT data.\n");
return -EINVAL; return -EINVAL;
} }
if (pdev->dev.platform_data) {
if (pdata->tsc_init)
tsc_wires = pdata->tsc_init->wires;
if (pdata->adc_init)
adc_channels = pdata->adc_init->adc_channels;
} else {
node = of_get_child_by_name(pdev->dev.of_node, "tsc"); node = of_get_child_by_name(pdev->dev.of_node, "tsc");
of_property_read_u32(node, "ti,wires", &tsc_wires); of_property_read_u32(node, "ti,wires", &tsc_wires);
node = of_get_child_by_name(pdev->dev.of_node, "adc"); node = of_get_child_by_name(pdev->dev.of_node, "adc");
of_property_read_u32(node, "ti,adc-channels", &adc_channels); of_property_read_u32(node, "ti,adc-channels", &adc_channels);
}
total_channels = tsc_wires + adc_channels; total_channels = tsc_wires + adc_channels;