Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drivers: bus: simple-pm-bus: Fix compatibility with simple-bus for auxdata

After converting am335x to probe devices with simple-pm-bus I noticed
that we are not passing auxdata for of_platform_populate() like we do
with simple-bus.

While device tree using SoCs should no longer need platform data, there
are still quite a few drivers that still need it as can be seen with
git grep OF_DEV_AUXDATA. We want to have simple-pm-bus be usable as a
replacement for simple-bus also for cases where OF_DEV_AUXDATA is still
needed.

Let's fix the issue by passing auxdata as platform data to simple-pm-bus.
That way the SoCs needing this can pass the auxdata with OF_DEV_AUXDATA.
And let's pass the auxdata for omaps to fix the issue for am335x.

As an alternative solution, adding simple-pm-bus handling directly to
drivers/of/platform.c was considered, but we would still need simple-pm-bus
device driver. So passing auxdata as platform data seems like the simplest
solution.

Fixes: 5a230524f879 ("ARM: dts: Use simple-pm-bus for genpd for am3 l4_wkup")
Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Tony Lindgren <tony@atomide.com>

+3 -1
+1
arch/arm/mach-omap2/pdata-quirks.c
··· 522 522 &dra7_ipu1_dsp_iommu_pdata), 523 523 #endif 524 524 /* Common auxdata */ 525 + OF_DEV_AUXDATA("simple-pm-bus", 0, NULL, omap_auxdata_lookup), 525 526 OF_DEV_AUXDATA("ti,sysc", 0, NULL, &ti_sysc_pdata), 526 527 OF_DEV_AUXDATA("pinctrl-single", 0, NULL, &pcs_pdata), 527 528 OF_DEV_AUXDATA("ti,omap-prm-inst", 0, NULL, &ti_prm_pdata),
+2 -1
drivers/bus/simple-pm-bus.c
··· 16 16 17 17 static int simple_pm_bus_probe(struct platform_device *pdev) 18 18 { 19 + const struct of_dev_auxdata *lookup = dev_get_platdata(&pdev->dev); 19 20 struct device_node *np = pdev->dev.of_node; 20 21 21 22 dev_dbg(&pdev->dev, "%s\n", __func__); ··· 24 23 pm_runtime_enable(&pdev->dev); 25 24 26 25 if (np) 27 - of_platform_populate(np, NULL, NULL, &pdev->dev); 26 + of_platform_populate(np, NULL, lookup, &pdev->dev); 28 27 29 28 return 0; 30 29 }