Commit 435ebcbc authored by Kefeng Wang's avatar Kefeng Wang Committed by Rob Herring
Browse files

arm: use of_platform_default_populate() to populate 



Use helper of_platform_default_populate() in linux/of_platform
when possible, instead of calling of_platform_populate() with
the default match table.

Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Krzysztof Halasa <khalasa@piap.pl>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Roland Stigge <stigge@antcom.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Viresh Kumar <vireshk@kernel.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 69d99e6c

arch/arm/mach-at91/at91rm9200.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static void __init at91rm9200_dt_device_init(void) 
	if (soc != NULL)

		soc_dev = soc_device_to_device(soc);



	of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev);

	of_platform_default_populate(NULL, NULL, soc_dev);



	at91rm9200_pm_init();

}

arch/arm/mach-at91/at91sam9.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static void __init at91sam9_common_init(void) 
	if (soc != NULL)

		soc_dev = soc_device_to_device(soc);



	of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev);

	of_platform_default_populate(NULL, NULL, soc_dev);

}



static void __init at91sam9_dt_device_init(void)

arch/arm/mach-at91/sama5.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static void __init sama5_dt_device_init(void) 
	if (soc != NULL)

		soc_dev = soc_device_to_device(soc);



	of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev);

	of_platform_default_populate(NULL, NULL, soc_dev);

	sama5_pm_init();

}

arch/arm/mach-cns3xxx/core.c

+1 −2
Original line number Diff line number Diff line
@@ -395,8 +395,7 @@ static void __init cns3xxx_init(void) 


	pm_power_off = cns3xxx_power_off;



	of_platform_populate(NULL, of_default_bus_match_table,

                        cns3xxx_auxdata, NULL);

	of_platform_default_populate(NULL, cns3xxx_auxdata, NULL);

}



static const char *const cns3xxx_dt_compat[] __initconst = {

arch/arm/mach-imx/mach-imx6q.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static void __init imx6q_init_machine(void) 


	imx6q_enet_phy_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);

	of_platform_default_populate(NULL, NULL, parent);



	imx_anatop_init();

	cpu_is_imx6q() ?  imx6q_pm_init() : imx6dl_pm_init();