]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - queue-4.4/mfd-ti_am335x_tscadc-use-platform_devid_auto-while-r.patch
drop perf-trace-support-multiple-vfs_getname-probes.patch from 4.4 and 4.9 queues
[thirdparty/kernel/stable-queue.git] / queue-4.4 / mfd-ti_am335x_tscadc-use-platform_devid_auto-while-r.patch
1 From 6d96c03a7dfb6aaf87fcd54ea1cf330746962720 Mon Sep 17 00:00:00 2001
2 From: Vignesh R <vigneshr@ti.com>
3 Date: Mon, 3 Dec 2018 13:31:17 +0530
4 Subject: mfd: ti_am335x_tscadc: Use PLATFORM_DEVID_AUTO while registering mfd
5 cells
6
7 [ Upstream commit b40ee006fe6a8a25093434e5d394128c356a48f3 ]
8
9 Use PLATFORM_DEVID_AUTO to number mfd cells while registering, so that
10 different instances are uniquely identified. This is required in order
11 to support registering of multiple instances of same ti_am335x_tscadc IP.
12
13 Signed-off-by: Vignesh R <vigneshr@ti.com>
14 Signed-off-by: Lee Jones <lee.jones@linaro.org>
15 Signed-off-by: Sasha Levin <sashal@kernel.org>
16 ---
17 drivers/mfd/ti_am335x_tscadc.c | 5 +++--
18 1 file changed, 3 insertions(+), 2 deletions(-)
19
20 diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
21 index 4a0f076c91ba0..faf8ce5be576f 100644
22 --- a/drivers/mfd/ti_am335x_tscadc.c
23 +++ b/drivers/mfd/ti_am335x_tscadc.c
24 @@ -279,8 +279,9 @@ static int ti_tscadc_probe(struct platform_device *pdev)
25 cell->pdata_size = sizeof(tscadc);
26 }
27
28 - err = mfd_add_devices(&pdev->dev, pdev->id, tscadc->cells,
29 - tscadc->used_cells, NULL, 0, NULL);
30 + err = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO,
31 + tscadc->cells, tscadc->used_cells, NULL,
32 + 0, NULL);
33 if (err < 0)
34 goto err_disable_clk;
35
36 --
37 2.19.1
38