From: Soren Brinkmann Date: Thu, 31 Oct 2013 16:10:17 +0000 (-0700) Subject: arm: zynq: Use of_platform_populate instead of bus_probe X-Git-Tag: firefly_0821_release~176^2~4590^2~10^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f4d5d7b7c60c0258f7556f5cfddec2934666aa77;p=firefly-linux-kernel-4.4.55.git arm: zynq: Use of_platform_populate instead of bus_probe All new boards should be using this function instead of of_platform_bus_probe. Two side effects: 1. Possible to probe node which are not in the bus 2. Remove bus_id table from platform code Signed-off-by: Soren Brinkmann Signed-off-by: Michal Simek --- diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 9a7bd137c8fd..b7b39294c225 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -39,11 +39,6 @@ void __iomem *zynq_scu_base; -static struct of_device_id zynq_of_bus_ids[] __initdata = { - { .compatible = "simple-bus", }, - {} -}; - static struct platform_device zynq_cpuidle_device = { .name = "cpuidle-zynq", }; @@ -59,7 +54,7 @@ static void __init zynq_init_machine(void) */ l2x0_of_init(0x02060000, 0xF0F0FFFF); - of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL); + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); platform_device_register(&zynq_cpuidle_device); }