Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a3acad2 authored by Ladislav Michl's avatar Ladislav Michl Committed by Tony Lindgren
Browse files

clocksource: timer-ti-dm: Hook device platform data if not already assigned 



In the case of device tree boot the device platform data is usually
NULL so hook the platform data obtained from the match.
As part of un-constify the platform_data pointer.

Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 76234f7c

drivers/clocksource/timer-ti-dm.c

+6 −4
Original line number Diff line number Diff line
@@ -806,14 +806,16 @@ static int omap_dm_timer_probe(struct platform_device *pdev) 
	struct omap_dm_timer *timer;

	struct resource *mem, *irq;

	struct device *dev = &pdev->dev;

	const struct of_device_id *match;

	const struct dmtimer_platform_data *pdata;

	int ret;



	match = of_match_device(of_match_ptr(omap_timer_match), dev);

	pdata = match ? match->data : dev->platform_data;

	pdata = of_device_get_match_data(dev);

	if (!pdata)

		pdata = dev_get_platdata(dev);

	else

		dev->platform_data = (void *)pdata;



	if (!pdata && !dev->of_node) {

	if (!pdata) {

		dev_err(dev, "%s: no platform data.\n", __func__);

		return -ENODEV;

	}