* [PATCH 00/15] use of_platform_default_populate() to populate default bus
@ 2016-01-27 4:27 Kefeng Wang
2016-01-27 4:27 ` [PATCH 01/15] arm: " Kefeng Wang
` (14 more replies)
0 siblings, 15 replies; 37+ messages in thread
From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Use helper of_platform_default_populate() in linux/of_platform
when possible, instead of calling of_platform_populate() with
the default match table.
Then it is possible for driver code build as a module, and no
need to export of_default_bus_match_table anymore.
This patchset is based on Linux 4.5-rc1, compile-tested only.
Kefeng Wang (15):
arm: use of_platform_default_populate() to populate default bus
arm64: use of_platform_default_populate() to populate default bus
mips: use of_platform_default_populate() to populate default bus
arc: use of_platform_default_populate() to populate default bus
c6x: use of_platform_default_populate() to populate default bus
metag: use of_platform_default_populate() to populate default bus
cris: use of_platform_default_populate() to populate default bus
nios2: use of_platform_default_populate() to populate default bus
xtensa: use of_platform_default_populate() to populate default bus
bus: imx-weim: use of_platform_default_populate() to populate default
bus
bus: uniphier-system-bus: use of_platform_default_populate() to
populate default bus
memory: omap-gpmc: use of_platform_default_populate() to populate
default bus
of: unittest: use of_platform_default_populate() to populate default
bus
Revert "bus: uniphier: allow only built-in driver"
Revert "of/platform: export of_default_bus_match_table"
arch/arc/kernel/setup.c | 2 +-
arch/arm/kernel/setup.c | 3 +--
arch/arm/mach-at91/at91rm9200.c | 2 +-
arch/arm/mach-at91/at91sam9.c | 2 +-
arch/arm/mach-at91/sama5.c | 2 +-
arch/arm/mach-bcm/board_bcm21664.c | 2 +-
arch/arm/mach-bcm/board_bcm281xx.c | 2 +-
arch/arm/mach-bcm/board_bcm2835.c | 5 ++---
arch/arm/mach-cns3xxx/core.c | 3 +--
arch/arm/mach-davinci/da8xx-dt.c | 3 +--
arch/arm/mach-exynos/exynos.c | 2 +-
arch/arm/mach-highbank/highbank.c | 2 +-
arch/arm/mach-imx/imx27-dt.c | 2 +-
arch/arm/mach-imx/mach-imx51.c | 2 +-
arch/arm/mach-imx/mach-imx53.c | 2 +-
arch/arm/mach-imx/mach-imx6q.c | 2 +-
arch/arm/mach-imx/mach-imx6sl.c | 2 +-
arch/arm/mach-imx/mach-imx6sx.c | 2 +-
arch/arm/mach-imx/mach-imx6ul.c | 2 +-
arch/arm/mach-imx/mach-imx7d.c | 2 +-
arch/arm/mach-integrator/integrator_ap.c | 3 +--
arch/arm/mach-integrator/integrator_cp.c | 3 +--
arch/arm/mach-keystone/keystone.c | 2 +-
arch/arm/mach-lpc32xx/phy3250.c | 3 +--
arch/arm/mach-mvebu/board-v7.c | 2 +-
arch/arm/mach-mvebu/dove.c | 2 +-
arch/arm/mach-mvebu/kirkwood.c | 2 +-
arch/arm/mach-mxs/mach-mxs.c | 3 +--
arch/arm/mach-nspire/nspire.c | 3 +--
arch/arm/mach-orion5x/board-dt.c | 3 +--
arch/arm/mach-picoxcell/common.c | 2 +-
arch/arm/mach-pxa/pxa-dt.c | 3 +--
arch/arm/mach-rockchip/rockchip.c | 2 +-
arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 2 +-
arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 2 +-
arch/arm/mach-shmobile/setup-r8a7740.c | 2 +-
arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
arch/arm/mach-spear/spear1310.c | 2 +-
arch/arm/mach-spear/spear1340.c | 2 +-
arch/arm/mach-spear/spear300.c | 3 +--
arch/arm/mach-spear/spear310.c | 3 +--
arch/arm/mach-spear/spear320.c | 3 +--
arch/arm/mach-spear/spear6xx.c | 3 +--
arch/arm/mach-tegra/tegra.c | 2 +-
arch/arm/mach-u300/core.c | 3 +--
arch/arm/mach-versatile/versatile_dt.c | 3 +--
arch/arm/mach-vt8500/vt8500.c | 2 +-
arch/arm/mach-zynq/common.c | 2 +-
arch/arm64/kernel/setup.c | 3 +--
arch/c6x/platforms/platform.c | 2 +-
arch/cris/kernel/setup.c | 2 +-
arch/metag/kernel/setup.c | 3 +--
arch/mips/ath79/setup.c | 2 +-
arch/mips/jz4740/setup.c | 2 +-
arch/mips/mti-sead3/sead3-setup.c | 2 +-
arch/mips/pic32/pic32mzda/init.c | 3 +--
arch/mips/pistachio/init.c | 2 +-
arch/mips/xilfpga/init.c | 2 +-
arch/nios2/platform/platform.c | 3 +--
arch/xtensa/kernel/setup.c | 2 +-
drivers/bus/Kconfig | 2 +-
drivers/bus/imx-weim.c | 5 ++---
drivers/bus/uniphier-system-bus.c | 3 +--
drivers/memory/omap-gpmc.c | 3 +--
drivers/of/platform.c | 1 -
drivers/of/unittest.c | 5 ++---
66 files changed, 68 insertions(+), 94 deletions(-)
--
2.6.0.GIT
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 01/15] arm: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 7:08 ` kbuild test robot 2016-01-27 7:53 ` [PATCH v2 " Kefeng Wang 2016-01-27 4:27 ` [PATCH 02/15] arm64: " Kefeng Wang ` (13 subsequent siblings) 14 siblings, 2 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Ray Jui <rjui@broadcom.com> Cc: Lee Jones <lee@kernel.org> Cc: Krzysztof Halasa <khalasa@piap.pl> Cc: Kukjin Kim <kgene@kernel.org> Cc: Rob Herring <robh@kernel.org> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Santosh Shilimkar <ssantosh@kernel.org> Cc: Roland Stigge <stigge@antcom.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Heiko Stuebner <heiko@sntech.de> Cc: Viresh Kumar <vireshk@kernel.org> Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com> Cc: Tony Prisk <linux@prisktech.co.nz> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/arm/kernel/setup.c | 3 +-- arch/arm/mach-at91/at91rm9200.c | 2 +- arch/arm/mach-at91/at91sam9.c | 2 +- arch/arm/mach-at91/sama5.c | 2 +- arch/arm/mach-bcm/board_bcm21664.c | 2 +- arch/arm/mach-bcm/board_bcm281xx.c | 2 +- arch/arm/mach-bcm/board_bcm2835.c | 5 ++--- arch/arm/mach-cns3xxx/core.c | 3 +-- arch/arm/mach-davinci/da8xx-dt.c | 3 +-- arch/arm/mach-exynos/exynos.c | 2 +- arch/arm/mach-highbank/highbank.c | 2 +- arch/arm/mach-imx/imx27-dt.c | 2 +- arch/arm/mach-imx/mach-imx51.c | 2 +- arch/arm/mach-imx/mach-imx53.c | 2 +- arch/arm/mach-imx/mach-imx6q.c | 2 +- arch/arm/mach-imx/mach-imx6sl.c | 2 +- arch/arm/mach-imx/mach-imx6sx.c | 2 +- arch/arm/mach-imx/mach-imx6ul.c | 2 +- arch/arm/mach-imx/mach-imx7d.c | 2 +- arch/arm/mach-integrator/integrator_ap.c | 3 +-- arch/arm/mach-integrator/integrator_cp.c | 3 +-- arch/arm/mach-keystone/keystone.c | 2 +- arch/arm/mach-lpc32xx/phy3250.c | 3 +-- arch/arm/mach-mvebu/board-v7.c | 2 +- arch/arm/mach-mvebu/dove.c | 2 +- arch/arm/mach-mvebu/kirkwood.c | 2 +- arch/arm/mach-mxs/mach-mxs.c | 3 +-- arch/arm/mach-nspire/nspire.c | 3 +-- arch/arm/mach-orion5x/board-dt.c | 3 +-- arch/arm/mach-picoxcell/common.c | 2 +- arch/arm/mach-pxa/pxa-dt.c | 3 +-- arch/arm/mach-rockchip/rockchip.c | 2 +- arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 2 +- arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 2 +- arch/arm/mach-shmobile/setup-r8a7740.c | 2 +- arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- arch/arm/mach-spear/spear1310.c | 2 +- arch/arm/mach-spear/spear1340.c | 2 +- arch/arm/mach-spear/spear300.c | 3 +-- arch/arm/mach-spear/spear310.c | 3 +-- arch/arm/mach-spear/spear320.c | 3 +-- arch/arm/mach-spear/spear6xx.c | 3 +-- arch/arm/mach-tegra/tegra.c | 2 +- arch/arm/mach-u300/core.c | 3 +-- arch/arm/mach-versatile/versatile_dt.c | 3 +-- arch/arm/mach-vt8500/vt8500.c | 2 +- arch/arm/mach-zynq/common.c | 2 +- 47 files changed, 48 insertions(+), 65 deletions(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 7d0cba6f..bdbafe9 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -905,8 +905,7 @@ static int __init customize_machine(void) machine_desc->init_machine(); #ifdef CONFIG_OF else - of_platform_populate(NULL, of_default_bus_match_table, - NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); #endif return 0; } diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index c1a7c6c..1904bc7 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -31,7 +31,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); arm_pm_idle = at91rm9200_idle; at91rm9200_pm_init(); diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c index 7eb64f7..d495620 100644 --- a/arch/arm/mach-at91/at91sam9.c +++ b/arch/arm/mach-at91/at91sam9.c @@ -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); arm_pm_idle = at91sam9_idle; } diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c index d9cf679..6db395e 100644 --- a/arch/arm/mach-at91/sama5.c +++ b/arch/arm/mach-at91/sama5.c @@ -50,7 +50,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); at91sam9x5_pm_init(); } diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c index 82ad568..b35c31c 100644 --- a/arch/arm/mach-bcm/board_bcm21664.c +++ b/arch/arm/mach-bcm/board_bcm21664.c @@ -60,7 +60,7 @@ static void bcm21664_restart(enum reboot_mode mode, const char *cmd) static void __init bcm21664_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); kona_l2_cache_init(); } diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c index 2e367bd..bf74547 100644 --- a/arch/arm/mach-bcm/board_bcm281xx.c +++ b/arch/arm/mach-bcm/board_bcm281xx.c @@ -58,7 +58,7 @@ static void bcm281xx_restart(enum reboot_mode mode, const char *cmd) static void __init bcm281xx_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); kona_l2_cache_init(); } diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c index 834d676..fd190bb 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -27,10 +27,9 @@ static void __init bcm2835_init(void) bcm2835_init_clocks(); - ret = of_platform_populate(NULL, of_default_bus_match_table, NULL, - NULL); + ret = of_platform_default_populate(NULL, NULL, NULL); if (ret) { - pr_err("of_platform_populate failed: %d\n", ret); + pr_err("of_platform_default_populate failed: %d\n", ret); BUG(); } } diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c index 9b1dc22..03da381 100644 --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c @@ -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 = { diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index c4b5808..da46dc7 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -54,8 +54,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { static void __init da850_init_machine(void) { - of_platform_populate(NULL, of_default_bus_match_table, - da850_auxdata_lookup, NULL); + of_platform_default_populate(NULL, da850_auxdata_lookup, NULL); } diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index 1c47aee..7bbdaae 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -271,7 +271,7 @@ static void __init exynos_dt_machine_init(void) exynos_cpufreq_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static char const *const exynos_dt_compat[] __initconst = { diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 6050a14..2e2d5df 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -163,7 +163,7 @@ static void __init highbank_init(void) pl320_ipc_register_notifier(&hb_keys_nb); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); if (psci_ops.cpu_suspend) platform_device_register(&highbank_cpuidle_device); diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c index bd42d1b..265dd08 100644 --- a/arch/arm/mach-imx/imx27-dt.c +++ b/arch/arm/mach-imx/imx27-dt.c @@ -22,7 +22,7 @@ static void __init imx27_dt_init(void) { struct platform_device_info devinfo = { .name = "cpufreq-dt", }; - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); platform_device_register_full(&devinfo); } diff --git a/arch/arm/mach-imx/mach-imx51.c b/arch/arm/mach-imx/mach-imx51.c index b015129..4a9852c 100644 --- a/arch/arm/mach-imx/mach-imx51.c +++ b/arch/arm/mach-imx/mach-imx51.c @@ -56,7 +56,7 @@ static void __init imx51_dt_init(void) imx51_ipu_mipi_setup(); imx_src_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); platform_device_register_full(&devinfo); } diff --git a/arch/arm/mach-imx/mach-imx53.c b/arch/arm/mach-imx/mach-imx53.c index 86316a9..6e915c3 100644 --- a/arch/arm/mach-imx/mach-imx53.c +++ b/arch/arm/mach-imx/mach-imx53.c @@ -32,7 +32,7 @@ static void __init imx53_dt_init(void) { imx_src_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); imx_aips_allow_unprivileged_access("fsl,imx53-aipstz"); } diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 3878494b..1b09843 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -275,7 +275,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(); diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c index 3003263..37ae87d 100644 --- a/arch/arm/mach-imx/mach-imx6sl.c +++ b/arch/arm/mach-imx/mach-imx6sl.c @@ -52,7 +52,7 @@ static void __init imx6sl_init_machine(void) if (parent == NULL) pr_warn("failed to initialize soc device\n"); - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); + of_platform_default_populate(NULL, NULL, parent); imx6sl_fec_init(); imx_anatop_init(); diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c index 6a0b061..107cfc1 100644 --- a/arch/arm/mach-imx/mach-imx6sx.c +++ b/arch/arm/mach-imx/mach-imx6sx.c @@ -72,7 +72,7 @@ static void __init imx6sx_init_machine(void) if (parent == NULL) pr_warn("failed to initialize soc device\n"); - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); + of_platform_default_populate(NULL, NULL, parent); imx6sx_enet_init(); imx_anatop_init(); diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c index a38b16b..fa9b512 100644 --- a/arch/arm/mach-imx/mach-imx6ul.c +++ b/arch/arm/mach-imx/mach-imx6ul.c @@ -64,7 +64,7 @@ static void __init imx6ul_init_machine(void) if (parent == NULL) pr_warn("failed to initialize soc device\n"); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); imx6ul_enet_init(); imx_anatop_init(); imx6ul_pm_init(); diff --git a/arch/arm/mach-imx/mach-imx7d.c b/arch/arm/mach-imx/mach-imx7d.c index 5a27f20..f5a60fb 100644 --- a/arch/arm/mach-imx/mach-imx7d.c +++ b/arch/arm/mach-imx/mach-imx7d.c @@ -93,7 +93,7 @@ static void __init imx7d_init_machine(void) if (parent == NULL) pr_warn("failed to initialize soc device\n"); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); imx_anatop_init(); imx7d_enet_init(); } diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 5b0e363..4c2facd 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -302,8 +302,7 @@ static void __init ap_init_of(void) if (!ebi_base) return; - of_platform_populate(NULL, of_default_bus_match_table, - ap_auxdata_lookup, NULL); + of_platform_default_populate(NULL, ap_auxdata_lookup, NULL); sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET); for (i = 0; i < 4; i++) { diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index b5fb71a..31d893e 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -282,8 +282,7 @@ static void __init intcp_init_of(void) if (!intcp_con_base) return; - of_platform_populate(NULL, of_default_bus_match_table, - intcp_auxdata_lookup, NULL); + of_platform_default_populate(NULL, intcp_auxdata_lookup, NULL); } static const char * intcp_dt_board_compat[] = { diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index c279293..67c3802 100644 --- a/arch/arm/mach-keystone/keystone.c +++ b/arch/arm/mach-keystone/keystone.c @@ -60,7 +60,7 @@ static void __init keystone_init(void) bus_register_notifier(&platform_bus_type, &platform_nb); } keystone_pm_runtime_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static phys_addr_t keystone_virt_to_idmap(unsigned long x) diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 77d6b1b..611ae6c 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -244,8 +244,7 @@ static void __init lpc3250_machine_init(void) LPC32XX_CLKPWR_TESTCLK_TESTCLK2_EN, LPC32XX_CLKPWR_TEST_CLK_SEL); - of_platform_populate(NULL, of_default_bus_match_table, - lpc32xx_auxdata_lookup, NULL); + of_platform_default_populate(NULL, lpc32xx_auxdata_lookup, NULL); } static const char *const lpc32xx_dt_compat[] __initconst = { diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c index 1648edd..3482539 100644 --- a/arch/arm/mach-mvebu/board-v7.c +++ b/arch/arm/mach-mvebu/board-v7.c @@ -145,7 +145,7 @@ static void __init mvebu_dt_init(void) if (of_machine_is_compatible("marvell,armadaxp")) i2c_quirk(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static const char * const armada_370_xp_dt_compat[] __initconst = { diff --git a/arch/arm/mach-mvebu/dove.c b/arch/arm/mach-mvebu/dove.c index 1aebb82..18130e9 100644 --- a/arch/arm/mach-mvebu/dove.c +++ b/arch/arm/mach-mvebu/dove.c @@ -26,7 +26,7 @@ static void __init dove_init(void) #endif BUG_ON(mvebu_mbus_dt_init(false)); dove_init_pmu(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static const char * const dove_dt_compat[] __initconst = { diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index f9d8e1e..8f459ee 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c @@ -179,7 +179,7 @@ static void __init kirkwood_dt_init(void) kirkwood_pm_init(); kirkwood_dt_eth_fixup(); - of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL); + of_platform_default_populate(NULL, auxdata, NULL); } static const char * const kirkwood_dt_board_compat[] __initconst = { diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index f1ea470..0b7fe74 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -498,8 +498,7 @@ static void __init mxs_machine_init(void) else if (of_machine_is_compatible("msr,m28cu3")) m28cu3_init(); - of_platform_populate(NULL, of_default_bus_match_table, - NULL, parent); + of_platform_default_populate(NULL, NULL, parent); mxs_restart_init(); diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c index 34c2a1b3..f0808fc 100644 --- a/arch/arm/mach-nspire/nspire.c +++ b/arch/arm/mach-nspire/nspire.c @@ -57,8 +57,7 @@ static struct of_dev_auxdata nspire_auxdata[] __initdata = { static void __init nspire_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, - nspire_auxdata, NULL); + of_platform_default_populate(NULL, nspire_auxdata, NULL); } static void nspire_restart(enum reboot_mode mode, const char *cmd) diff --git a/arch/arm/mach-orion5x/board-dt.c b/arch/arm/mach-orion5x/board-dt.c index 6f4c2c4..3d36f1d 100644 --- a/arch/arm/mach-orion5x/board-dt.c +++ b/arch/arm/mach-orion5x/board-dt.c @@ -63,8 +63,7 @@ static void __init orion5x_dt_init(void) if (of_machine_is_compatible("maxtor,shared-storage-2")) mss2_init(); - of_platform_populate(NULL, of_default_bus_match_table, - orion5x_auxdata_lookup, NULL); + of_platform_default_populate(NULL, orion5x_auxdata_lookup, NULL); } static const char *orion5x_dt_compat[] = { diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c index ec79fea..add8622 100644 --- a/arch/arm/mach-picoxcell/common.c +++ b/arch/arm/mach-picoxcell/common.c @@ -54,7 +54,7 @@ static void __init picoxcell_map_io(void) static void __init picoxcell_init_machine(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); picoxcell_setup_restart(); } diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c index 8e0e62c..017e0d1 100644 --- a/arch/arm/mach-pxa/pxa-dt.c +++ b/arch/arm/mach-pxa/pxa-dt.c @@ -35,8 +35,7 @@ static const struct of_dev_auxdata const pxa3xx_auxdata_lookup[] __initconst = { static void __init pxa3xx_dt_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, - pxa3xx_auxdata_lookup, NULL); + of_platform_default_populate(NULL, pxa3xx_auxdata_lookup, NULL); } static const char *const pxa3xx_dt_board_compat[] __initconst = { diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c index 3f07cc5..07ef8ef 100644 --- a/arch/arm/mach-rockchip/rockchip.c +++ b/arch/arm/mach-rockchip/rockchip.c @@ -73,7 +73,7 @@ static void __init rockchip_timer_init(void) static void __init rockchip_dt_init(void) { rockchip_suspend_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); platform_device_register_simple("cpufreq-dt", 0, NULL, 0); } diff --git a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c index 5f028ff..5991e98 100644 --- a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c +++ b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c @@ -35,7 +35,7 @@ static void __init s3c2416_dt_map_io(void) static void __init s3c2416_dt_machine_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); s3c_pm_init(); } diff --git a/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c b/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c index bbf74ed..ebc9d5f 100644 --- a/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c +++ b/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c @@ -48,7 +48,7 @@ static void __init s3c64xx_dt_map_io(void) static void __init s3c64xx_dt_init_machine(void) { samsung_wdt_reset_of_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static void s3c64xx_dt_restart(enum reboot_mode mode, const char *cmd) diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 0c8f80c..1eabb99 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -114,7 +114,7 @@ static void __init r8a7740_generic_init(void) /* Shared attribute override enable, 32K*8way */ l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff); #endif - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static const char *const r8a7740_boards_compat_dt[] __initconst = { diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index 99a2004..af38daf 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -55,7 +55,7 @@ static void __init sh73a0_generic_init(void) /* Shared attribute override enable, 64K*8way */ l2x0_init(IOMEM(0xf0100000), 0x00400000, 0xc20f0fff); #endif - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static const char *const sh73a0_boards_compat_dt[] __initconst = { diff --git a/arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear/spear1310.c index cd5d375..3f5efcb 100644 --- a/arch/arm/mach-spear/spear1310.c +++ b/arch/arm/mach-spear/spear1310.c @@ -27,7 +27,7 @@ static void __init spear1310_dt_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); platform_device_register_simple("spear-cpufreq", -1, NULL, 0); } diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c index 94594d5..30969b6 100644 --- a/arch/arm/mach-spear/spear1340.c +++ b/arch/arm/mach-spear/spear1340.c @@ -19,7 +19,7 @@ static void __init spear1340_dt_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); platform_device_register_simple("spear-cpufreq", -1, NULL, 0); } diff --git a/arch/arm/mach-spear/spear300.c b/arch/arm/mach-spear/spear300.c index 5b32edd..325b895 100644 --- a/arch/arm/mach-spear/spear300.c +++ b/arch/arm/mach-spear/spear300.c @@ -194,8 +194,7 @@ static void __init spear300_dt_init(void) pl080_plat_data.slave_channels = spear300_dma_info; pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear300_dma_info); - of_platform_populate(NULL, of_default_bus_match_table, - spear300_auxdata_lookup, NULL); + of_platform_default_populate(NULL, spear300_auxdata_lookup, NULL); } static const char * const spear300_dt_board_compat[] = { diff --git a/arch/arm/mach-spear/spear310.c b/arch/arm/mach-spear/spear310.c index 86a44ac..59e173d 100644 --- a/arch/arm/mach-spear/spear310.c +++ b/arch/arm/mach-spear/spear310.c @@ -236,8 +236,7 @@ static void __init spear310_dt_init(void) pl080_plat_data.slave_channels = spear310_dma_info; pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear310_dma_info); - of_platform_populate(NULL, of_default_bus_match_table, - spear310_auxdata_lookup, NULL); + of_platform_default_populate(NULL, spear310_auxdata_lookup, NULL); } static const char * const spear310_dt_board_compat[] = { diff --git a/arch/arm/mach-spear/spear320.c b/arch/arm/mach-spear/spear320.c index d45d751..0958f68 100644 --- a/arch/arm/mach-spear/spear320.c +++ b/arch/arm/mach-spear/spear320.c @@ -240,8 +240,7 @@ static void __init spear320_dt_init(void) pl080_plat_data.slave_channels = spear320_dma_info; pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear320_dma_info); - of_platform_populate(NULL, of_default_bus_match_table, - spear320_auxdata_lookup, NULL); + of_platform_default_populate(NULL, spear320_auxdata_lookup, NULL); } static const char * const spear320_dt_board_compat[] = { diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index da26fa5b..ccf3573 100644 --- a/arch/arm/mach-spear/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c @@ -411,8 +411,7 @@ struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = { static void __init spear600_dt_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, - spear6xx_auxdata_lookup, NULL); + of_platform_default_populate(NULL, spear6xx_auxdata_lookup, NULL); } static const char *spear600_dt_board_compat[] = { diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index 2378fa56..6745a65 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c @@ -115,7 +115,7 @@ static void __init tegra_dt_init(void) * devices */ out: - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); + of_platform_default_populate(NULL, NULL, parent); } static void __init paz00_init(void) diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 546338b..a4910ea 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -391,8 +391,7 @@ static void __init u300_init_machine_dt(void) pinctrl_register_mappings(u300_pinmux_map, ARRAY_SIZE(u300_pinmux_map)); - of_platform_populate(NULL, of_default_bus_match_table, - u300_auxdata_lookup, NULL); + of_platform_default_populate(NULL, u300_auxdata_lookup, NULL); /* Enable SEMI self refresh */ val = readw(syscon_base + U300_SYSCON_SMCR) | diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c index c448718..1a36c97 100644 --- a/arch/arm/mach-versatile/versatile_dt.c +++ b/arch/arm/mach-versatile/versatile_dt.c @@ -405,8 +405,7 @@ static void __init versatile_dt_init(void) versatile_dt_pci_init(); platform_device_register(&versatile_flash_device); - of_platform_populate(NULL, of_default_bus_match_table, - versatile_auxdata_lookup, NULL); + of_platform_default_populate(NULL, versatile_auxdata_lookup, NULL); } static const char *const versatile_dt_match[] __initconst = { diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c index 3bc0dc9..69bb16c 100644 --- a/arch/arm/mach-vt8500/vt8500.c +++ b/arch/arm/mach-vt8500/vt8500.c @@ -159,7 +159,7 @@ static void __init vt8500_init(void) else pr_err("%s: PMC Hibernation register could not be remapped, not enabling power off!\n", __func__); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static const char * const vt8500_dt_compat[] = { diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 6f39d03..563575d 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -142,7 +142,7 @@ out: * Finished with the static registrations now; fill in the missing * devices */ - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); + of_platform_default_populate(NULL, NULL, parent); platform_device_register(&zynq_cpuidle_device); platform_device_register_full(&devinfo); -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 01/15] arm: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 ` [PATCH 01/15] arm: " Kefeng Wang @ 2016-01-27 7:08 ` kbuild test robot 2016-01-27 7:50 ` Kefeng Wang 2016-01-27 7:53 ` [PATCH v2 " Kefeng Wang 1 sibling, 1 reply; 37+ messages in thread From: kbuild test robot @ 2016-01-27 7:08 UTC (permalink / raw) To: linux-arm-kernel Hi Kefeng, [auto build test ERROR on v4.5-rc1] [cannot apply to arm-soc/for-next next-20160127] [if your patch is applied to the wrong git tree, please drop us a note to help improving the system] url: https://github.com/0day-ci/linux/commits/Kefeng-Wang/use-of_platform_default_populate-to-populate-default-bus/20160127-123512 config: arm-at91_dt_defconfig (attached as .config) reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=arm All errors (new ones prefixed by >>): arch/arm/mach-at91/at91rm9200.c: In function 'at91rm9200_dt_device_init': >> arch/arm/mach-at91/at91rm9200.c:34:2: error: implicit declaration of function 'of_platform__default_populate' [-Werror=implicit-function-declaration] of_platform__default_populate(NULL, NULL, soc_dev); ^ cc1: some warnings being treated as errors vim +/of_platform__default_populate +34 arch/arm/mach-at91/at91rm9200.c 28 struct device *soc_dev = NULL; 29 30 soc = at91_soc_init(rm9200_socs); 31 if (soc != NULL) 32 soc_dev = soc_device_to_device(soc); 33 > 34 of_platform__default_populate(NULL, NULL, soc_dev); 35 36 arm_pm_idle = at91rm9200_idle; 37 at91rm9200_pm_init(); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation -------------- next part -------------- A non-text attachment was scrubbed... Name: .config.gz Type: application/octet-stream Size: 20787 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160127/15792d42/attachment-0001.obj> ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 01/15] arm: use of_platform_default_populate() to populate default bus 2016-01-27 7:08 ` kbuild test robot @ 2016-01-27 7:50 ` Kefeng Wang 0 siblings, 0 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 7:50 UTC (permalink / raw) To: linux-arm-kernel On 2016/1/27 15:08, kbuild test robot wrote: > Hi Kefeng, > > [auto build test ERROR on v4.5-rc1] > [cannot apply to arm-soc/for-next next-20160127] > [if your patch is applied to the wrong git tree, please drop us a note to help improving the system] > > url: https://github.com/0day-ci/linux/commits/Kefeng-Wang/use-of_platform_default_populate-to-populate-default-bus/20160127-123512 > config: arm-at91_dt_defconfig (attached as .config) > reproduce: > wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross > chmod +x ~/bin/make.cross > # save the attached .config to linux build tree > make.cross ARCH=arm > > All errors (new ones prefixed by >>): > > arch/arm/mach-at91/at91rm9200.c: In function 'at91rm9200_dt_device_init': >>> arch/arm/mach-at91/at91rm9200.c:34:2: error: implicit declaration of function 'of_platform__default_populate' [-Werror=implicit-function-declaration] > of_platform__default_populate(NULL, NULL, soc_dev); sorry for the typo, fix in v2. > ^ > cc1: some warnings being treated as errors > > vim +/of_platform__default_populate +34 arch/arm/mach-at91/at91rm9200.c > > 28 struct device *soc_dev = NULL; > 29 > 30 soc = at91_soc_init(rm9200_socs); > 31 if (soc != NULL) > 32 soc_dev = soc_device_to_device(soc); > 33 > > 34 of_platform__default_populate(NULL, NULL, soc_dev); > 35 > 36 arm_pm_idle = at91rm9200_idle; > 37 at91rm9200_pm_init(); > > --- > 0-DAY kernel test infrastructure Open Source Technology Center > https://lists.01.org/pipermail/kbuild-all Intel Corporation > ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 01/15] arm: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 ` [PATCH 01/15] arm: " Kefeng Wang 2016-01-27 7:08 ` kbuild test robot @ 2016-01-27 7:53 ` Kefeng Wang 2016-02-01 13:53 ` Shawn Guo ` (3 more replies) 1 sibling, 4 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 7:53 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Ray Jui <rjui@broadcom.com> Cc: Lee Jones <lee@kernel.org> Cc: Krzysztof Halasa <khalasa@piap.pl> Cc: Kukjin Kim <kgene@kernel.org> Cc: Rob Herring <robh@kernel.org> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Santosh Shilimkar <ssantosh@kernel.org> Cc: Roland Stigge <stigge@antcom.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Heiko Stuebner <heiko@sntech.de> Cc: Viresh Kumar <vireshk@kernel.org> Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com> Cc: Tony Prisk <linux@prisktech.co.nz> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/arm/kernel/setup.c | 3 +-- arch/arm/mach-at91/at91rm9200.c | 2 +- arch/arm/mach-at91/at91sam9.c | 2 +- arch/arm/mach-at91/sama5.c | 2 +- arch/arm/mach-bcm/board_bcm21664.c | 2 +- arch/arm/mach-bcm/board_bcm281xx.c | 2 +- arch/arm/mach-bcm/board_bcm2835.c | 5 ++--- arch/arm/mach-cns3xxx/core.c | 3 +-- arch/arm/mach-davinci/da8xx-dt.c | 3 +-- arch/arm/mach-exynos/exynos.c | 2 +- arch/arm/mach-highbank/highbank.c | 2 +- arch/arm/mach-imx/imx27-dt.c | 2 +- arch/arm/mach-imx/mach-imx51.c | 2 +- arch/arm/mach-imx/mach-imx53.c | 2 +- arch/arm/mach-imx/mach-imx6q.c | 2 +- arch/arm/mach-imx/mach-imx6sl.c | 2 +- arch/arm/mach-imx/mach-imx6sx.c | 2 +- arch/arm/mach-imx/mach-imx6ul.c | 2 +- arch/arm/mach-imx/mach-imx7d.c | 2 +- arch/arm/mach-integrator/integrator_ap.c | 3 +-- arch/arm/mach-integrator/integrator_cp.c | 3 +-- arch/arm/mach-keystone/keystone.c | 2 +- arch/arm/mach-lpc32xx/phy3250.c | 3 +-- arch/arm/mach-mvebu/board-v7.c | 2 +- arch/arm/mach-mvebu/dove.c | 2 +- arch/arm/mach-mvebu/kirkwood.c | 2 +- arch/arm/mach-mxs/mach-mxs.c | 3 +-- arch/arm/mach-nspire/nspire.c | 3 +-- arch/arm/mach-orion5x/board-dt.c | 3 +-- arch/arm/mach-picoxcell/common.c | 2 +- arch/arm/mach-pxa/pxa-dt.c | 3 +-- arch/arm/mach-rockchip/rockchip.c | 2 +- arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 2 +- arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 2 +- arch/arm/mach-shmobile/setup-r8a7740.c | 2 +- arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- arch/arm/mach-spear/spear1310.c | 2 +- arch/arm/mach-spear/spear1340.c | 2 +- arch/arm/mach-spear/spear300.c | 3 +-- arch/arm/mach-spear/spear310.c | 3 +-- arch/arm/mach-spear/spear320.c | 3 +-- arch/arm/mach-spear/spear6xx.c | 3 +-- arch/arm/mach-tegra/tegra.c | 2 +- arch/arm/mach-u300/core.c | 3 +-- arch/arm/mach-versatile/versatile_dt.c | 3 +-- arch/arm/mach-vt8500/vt8500.c | 2 +- arch/arm/mach-zynq/common.c | 2 +- 47 files changed, 48 insertions(+), 65 deletions(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 7d0cba6f..bdbafe9 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -905,8 +905,7 @@ static int __init customize_machine(void) machine_desc->init_machine(); #ifdef CONFIG_OF else - of_platform_populate(NULL, of_default_bus_match_table, - NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); #endif return 0; } diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index c1a7c6c..1904bc7 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -31,7 +31,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); arm_pm_idle = at91rm9200_idle; at91rm9200_pm_init(); diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c index 7eb64f7..d495620 100644 --- a/arch/arm/mach-at91/at91sam9.c +++ b/arch/arm/mach-at91/at91sam9.c @@ -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); arm_pm_idle = at91sam9_idle; } diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c index d9cf679..6db395e 100644 --- a/arch/arm/mach-at91/sama5.c +++ b/arch/arm/mach-at91/sama5.c @@ -50,7 +50,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); at91sam9x5_pm_init(); } diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c index 82ad568..b35c31c 100644 --- a/arch/arm/mach-bcm/board_bcm21664.c +++ b/arch/arm/mach-bcm/board_bcm21664.c @@ -60,7 +60,7 @@ static void bcm21664_restart(enum reboot_mode mode, const char *cmd) static void __init bcm21664_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); kona_l2_cache_init(); } diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c index 2e367bd..bf74547 100644 --- a/arch/arm/mach-bcm/board_bcm281xx.c +++ b/arch/arm/mach-bcm/board_bcm281xx.c @@ -58,7 +58,7 @@ static void bcm281xx_restart(enum reboot_mode mode, const char *cmd) static void __init bcm281xx_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); kona_l2_cache_init(); } diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c index 834d676..fd190bb 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -27,10 +27,9 @@ static void __init bcm2835_init(void) bcm2835_init_clocks(); - ret = of_platform_populate(NULL, of_default_bus_match_table, NULL, - NULL); + ret = of_platform_default_populate(NULL, NULL, NULL); if (ret) { - pr_err("of_platform_populate failed: %d\n", ret); + pr_err("of_platform_default_populate failed: %d\n", ret); BUG(); } } diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c index 9b1dc22..03da381 100644 --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c @@ -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 = { diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index c4b5808..da46dc7 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -54,8 +54,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { static void __init da850_init_machine(void) { - of_platform_populate(NULL, of_default_bus_match_table, - da850_auxdata_lookup, NULL); + of_platform_default_populate(NULL, da850_auxdata_lookup, NULL); } diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index 1c47aee..7bbdaae 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -271,7 +271,7 @@ static void __init exynos_dt_machine_init(void) exynos_cpufreq_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static char const *const exynos_dt_compat[] __initconst = { diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 6050a14..2e2d5df 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -163,7 +163,7 @@ static void __init highbank_init(void) pl320_ipc_register_notifier(&hb_keys_nb); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); if (psci_ops.cpu_suspend) platform_device_register(&highbank_cpuidle_device); diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c index bd42d1b..265dd08 100644 --- a/arch/arm/mach-imx/imx27-dt.c +++ b/arch/arm/mach-imx/imx27-dt.c @@ -22,7 +22,7 @@ static void __init imx27_dt_init(void) { struct platform_device_info devinfo = { .name = "cpufreq-dt", }; - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); platform_device_register_full(&devinfo); } diff --git a/arch/arm/mach-imx/mach-imx51.c b/arch/arm/mach-imx/mach-imx51.c index b015129..4a9852c 100644 --- a/arch/arm/mach-imx/mach-imx51.c +++ b/arch/arm/mach-imx/mach-imx51.c @@ -56,7 +56,7 @@ static void __init imx51_dt_init(void) imx51_ipu_mipi_setup(); imx_src_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); platform_device_register_full(&devinfo); } diff --git a/arch/arm/mach-imx/mach-imx53.c b/arch/arm/mach-imx/mach-imx53.c index 86316a9..6e915c3 100644 --- a/arch/arm/mach-imx/mach-imx53.c +++ b/arch/arm/mach-imx/mach-imx53.c @@ -32,7 +32,7 @@ static void __init imx53_dt_init(void) { imx_src_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); imx_aips_allow_unprivileged_access("fsl,imx53-aipstz"); } diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 3878494b..1b09843 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -275,7 +275,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(); diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c index 3003263..37ae87d 100644 --- a/arch/arm/mach-imx/mach-imx6sl.c +++ b/arch/arm/mach-imx/mach-imx6sl.c @@ -52,7 +52,7 @@ static void __init imx6sl_init_machine(void) if (parent == NULL) pr_warn("failed to initialize soc device\n"); - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); + of_platform_default_populate(NULL, NULL, parent); imx6sl_fec_init(); imx_anatop_init(); diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c index 6a0b061..107cfc1 100644 --- a/arch/arm/mach-imx/mach-imx6sx.c +++ b/arch/arm/mach-imx/mach-imx6sx.c @@ -72,7 +72,7 @@ static void __init imx6sx_init_machine(void) if (parent == NULL) pr_warn("failed to initialize soc device\n"); - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); + of_platform_default_populate(NULL, NULL, parent); imx6sx_enet_init(); imx_anatop_init(); diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c index a38b16b..fa9b512 100644 --- a/arch/arm/mach-imx/mach-imx6ul.c +++ b/arch/arm/mach-imx/mach-imx6ul.c @@ -64,7 +64,7 @@ static void __init imx6ul_init_machine(void) if (parent == NULL) pr_warn("failed to initialize soc device\n"); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); imx6ul_enet_init(); imx_anatop_init(); imx6ul_pm_init(); diff --git a/arch/arm/mach-imx/mach-imx7d.c b/arch/arm/mach-imx/mach-imx7d.c index 5a27f20..f5a60fb 100644 --- a/arch/arm/mach-imx/mach-imx7d.c +++ b/arch/arm/mach-imx/mach-imx7d.c @@ -93,7 +93,7 @@ static void __init imx7d_init_machine(void) if (parent == NULL) pr_warn("failed to initialize soc device\n"); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); imx_anatop_init(); imx7d_enet_init(); } diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 5b0e363..4c2facd 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -302,8 +302,7 @@ static void __init ap_init_of(void) if (!ebi_base) return; - of_platform_populate(NULL, of_default_bus_match_table, - ap_auxdata_lookup, NULL); + of_platform_default_populate(NULL, ap_auxdata_lookup, NULL); sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET); for (i = 0; i < 4; i++) { diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index b5fb71a..31d893e 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -282,8 +282,7 @@ static void __init intcp_init_of(void) if (!intcp_con_base) return; - of_platform_populate(NULL, of_default_bus_match_table, - intcp_auxdata_lookup, NULL); + of_platform_default_populate(NULL, intcp_auxdata_lookup, NULL); } static const char * intcp_dt_board_compat[] = { diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index c279293..67c3802 100644 --- a/arch/arm/mach-keystone/keystone.c +++ b/arch/arm/mach-keystone/keystone.c @@ -60,7 +60,7 @@ static void __init keystone_init(void) bus_register_notifier(&platform_bus_type, &platform_nb); } keystone_pm_runtime_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static phys_addr_t keystone_virt_to_idmap(unsigned long x) diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 77d6b1b..611ae6c 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -244,8 +244,7 @@ static void __init lpc3250_machine_init(void) LPC32XX_CLKPWR_TESTCLK_TESTCLK2_EN, LPC32XX_CLKPWR_TEST_CLK_SEL); - of_platform_populate(NULL, of_default_bus_match_table, - lpc32xx_auxdata_lookup, NULL); + of_platform_default_populate(NULL, lpc32xx_auxdata_lookup, NULL); } static const char *const lpc32xx_dt_compat[] __initconst = { diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c index 1648edd..3482539 100644 --- a/arch/arm/mach-mvebu/board-v7.c +++ b/arch/arm/mach-mvebu/board-v7.c @@ -145,7 +145,7 @@ static void __init mvebu_dt_init(void) if (of_machine_is_compatible("marvell,armadaxp")) i2c_quirk(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static const char * const armada_370_xp_dt_compat[] __initconst = { diff --git a/arch/arm/mach-mvebu/dove.c b/arch/arm/mach-mvebu/dove.c index 1aebb82..18130e9 100644 --- a/arch/arm/mach-mvebu/dove.c +++ b/arch/arm/mach-mvebu/dove.c @@ -26,7 +26,7 @@ static void __init dove_init(void) #endif BUG_ON(mvebu_mbus_dt_init(false)); dove_init_pmu(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static const char * const dove_dt_compat[] __initconst = { diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index f9d8e1e..8f459ee 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c @@ -179,7 +179,7 @@ static void __init kirkwood_dt_init(void) kirkwood_pm_init(); kirkwood_dt_eth_fixup(); - of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL); + of_platform_default_populate(NULL, auxdata, NULL); } static const char * const kirkwood_dt_board_compat[] __initconst = { diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index f1ea470..0b7fe74 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -498,8 +498,7 @@ static void __init mxs_machine_init(void) else if (of_machine_is_compatible("msr,m28cu3")) m28cu3_init(); - of_platform_populate(NULL, of_default_bus_match_table, - NULL, parent); + of_platform_default_populate(NULL, NULL, parent); mxs_restart_init(); diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c index 34c2a1b3..f0808fc 100644 --- a/arch/arm/mach-nspire/nspire.c +++ b/arch/arm/mach-nspire/nspire.c @@ -57,8 +57,7 @@ static struct of_dev_auxdata nspire_auxdata[] __initdata = { static void __init nspire_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, - nspire_auxdata, NULL); + of_platform_default_populate(NULL, nspire_auxdata, NULL); } static void nspire_restart(enum reboot_mode mode, const char *cmd) diff --git a/arch/arm/mach-orion5x/board-dt.c b/arch/arm/mach-orion5x/board-dt.c index 6f4c2c4..3d36f1d 100644 --- a/arch/arm/mach-orion5x/board-dt.c +++ b/arch/arm/mach-orion5x/board-dt.c @@ -63,8 +63,7 @@ static void __init orion5x_dt_init(void) if (of_machine_is_compatible("maxtor,shared-storage-2")) mss2_init(); - of_platform_populate(NULL, of_default_bus_match_table, - orion5x_auxdata_lookup, NULL); + of_platform_default_populate(NULL, orion5x_auxdata_lookup, NULL); } static const char *orion5x_dt_compat[] = { diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c index ec79fea..add8622 100644 --- a/arch/arm/mach-picoxcell/common.c +++ b/arch/arm/mach-picoxcell/common.c @@ -54,7 +54,7 @@ static void __init picoxcell_map_io(void) static void __init picoxcell_init_machine(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); picoxcell_setup_restart(); } diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c index 8e0e62c..017e0d1 100644 --- a/arch/arm/mach-pxa/pxa-dt.c +++ b/arch/arm/mach-pxa/pxa-dt.c @@ -35,8 +35,7 @@ static const struct of_dev_auxdata const pxa3xx_auxdata_lookup[] __initconst = { static void __init pxa3xx_dt_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, - pxa3xx_auxdata_lookup, NULL); + of_platform_default_populate(NULL, pxa3xx_auxdata_lookup, NULL); } static const char *const pxa3xx_dt_board_compat[] __initconst = { diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c index 3f07cc5..07ef8ef 100644 --- a/arch/arm/mach-rockchip/rockchip.c +++ b/arch/arm/mach-rockchip/rockchip.c @@ -73,7 +73,7 @@ static void __init rockchip_timer_init(void) static void __init rockchip_dt_init(void) { rockchip_suspend_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); platform_device_register_simple("cpufreq-dt", 0, NULL, 0); } diff --git a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c index 5f028ff..5991e98 100644 --- a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c +++ b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c @@ -35,7 +35,7 @@ static void __init s3c2416_dt_map_io(void) static void __init s3c2416_dt_machine_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); s3c_pm_init(); } diff --git a/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c b/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c index bbf74ed..ebc9d5f 100644 --- a/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c +++ b/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c @@ -48,7 +48,7 @@ static void __init s3c64xx_dt_map_io(void) static void __init s3c64xx_dt_init_machine(void) { samsung_wdt_reset_of_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static void s3c64xx_dt_restart(enum reboot_mode mode, const char *cmd) diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 0c8f80c..1eabb99 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -114,7 +114,7 @@ static void __init r8a7740_generic_init(void) /* Shared attribute override enable, 32K*8way */ l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff); #endif - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static const char *const r8a7740_boards_compat_dt[] __initconst = { diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index 99a2004..af38daf 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -55,7 +55,7 @@ static void __init sh73a0_generic_init(void) /* Shared attribute override enable, 64K*8way */ l2x0_init(IOMEM(0xf0100000), 0x00400000, 0xc20f0fff); #endif - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static const char *const sh73a0_boards_compat_dt[] __initconst = { diff --git a/arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear/spear1310.c index cd5d375..3f5efcb 100644 --- a/arch/arm/mach-spear/spear1310.c +++ b/arch/arm/mach-spear/spear1310.c @@ -27,7 +27,7 @@ static void __init spear1310_dt_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); platform_device_register_simple("spear-cpufreq", -1, NULL, 0); } diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c index 94594d5..30969b6 100644 --- a/arch/arm/mach-spear/spear1340.c +++ b/arch/arm/mach-spear/spear1340.c @@ -19,7 +19,7 @@ static void __init spear1340_dt_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); platform_device_register_simple("spear-cpufreq", -1, NULL, 0); } diff --git a/arch/arm/mach-spear/spear300.c b/arch/arm/mach-spear/spear300.c index 5b32edd..325b895 100644 --- a/arch/arm/mach-spear/spear300.c +++ b/arch/arm/mach-spear/spear300.c @@ -194,8 +194,7 @@ static void __init spear300_dt_init(void) pl080_plat_data.slave_channels = spear300_dma_info; pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear300_dma_info); - of_platform_populate(NULL, of_default_bus_match_table, - spear300_auxdata_lookup, NULL); + of_platform_default_populate(NULL, spear300_auxdata_lookup, NULL); } static const char * const spear300_dt_board_compat[] = { diff --git a/arch/arm/mach-spear/spear310.c b/arch/arm/mach-spear/spear310.c index 86a44ac..59e173d 100644 --- a/arch/arm/mach-spear/spear310.c +++ b/arch/arm/mach-spear/spear310.c @@ -236,8 +236,7 @@ static void __init spear310_dt_init(void) pl080_plat_data.slave_channels = spear310_dma_info; pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear310_dma_info); - of_platform_populate(NULL, of_default_bus_match_table, - spear310_auxdata_lookup, NULL); + of_platform_default_populate(NULL, spear310_auxdata_lookup, NULL); } static const char * const spear310_dt_board_compat[] = { diff --git a/arch/arm/mach-spear/spear320.c b/arch/arm/mach-spear/spear320.c index d45d751..0958f68 100644 --- a/arch/arm/mach-spear/spear320.c +++ b/arch/arm/mach-spear/spear320.c @@ -240,8 +240,7 @@ static void __init spear320_dt_init(void) pl080_plat_data.slave_channels = spear320_dma_info; pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear320_dma_info); - of_platform_populate(NULL, of_default_bus_match_table, - spear320_auxdata_lookup, NULL); + of_platform_default_populate(NULL, spear320_auxdata_lookup, NULL); } static const char * const spear320_dt_board_compat[] = { diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index da26fa5b..ccf3573 100644 --- a/arch/arm/mach-spear/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c @@ -411,8 +411,7 @@ struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = { static void __init spear600_dt_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, - spear6xx_auxdata_lookup, NULL); + of_platform_default_populate(NULL, spear6xx_auxdata_lookup, NULL); } static const char *spear600_dt_board_compat[] = { diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index 2378fa56..6745a65 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c @@ -115,7 +115,7 @@ static void __init tegra_dt_init(void) * devices */ out: - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); + of_platform_default_populate(NULL, NULL, parent); } static void __init paz00_init(void) diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 546338b..a4910ea 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -391,8 +391,7 @@ static void __init u300_init_machine_dt(void) pinctrl_register_mappings(u300_pinmux_map, ARRAY_SIZE(u300_pinmux_map)); - of_platform_populate(NULL, of_default_bus_match_table, - u300_auxdata_lookup, NULL); + of_platform_default_populate(NULL, u300_auxdata_lookup, NULL); /* Enable SEMI self refresh */ val = readw(syscon_base + U300_SYSCON_SMCR) | diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c index c448718..1a36c97 100644 --- a/arch/arm/mach-versatile/versatile_dt.c +++ b/arch/arm/mach-versatile/versatile_dt.c @@ -405,8 +405,7 @@ static void __init versatile_dt_init(void) versatile_dt_pci_init(); platform_device_register(&versatile_flash_device); - of_platform_populate(NULL, of_default_bus_match_table, - versatile_auxdata_lookup, NULL); + of_platform_default_populate(NULL, versatile_auxdata_lookup, NULL); } static const char *const versatile_dt_match[] __initconst = { diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c index 3bc0dc9..69bb16c 100644 --- a/arch/arm/mach-vt8500/vt8500.c +++ b/arch/arm/mach-vt8500/vt8500.c @@ -159,7 +159,7 @@ static void __init vt8500_init(void) else pr_err("%s: PMC Hibernation register could not be remapped, not enabling power off!\n", __func__); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } static const char * const vt8500_dt_compat[] = { diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 6f39d03..563575d 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -142,7 +142,7 @@ out: * Finished with the static registrations now; fill in the missing * devices */ - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); + of_platform_default_populate(NULL, NULL, parent); platform_device_register(&zynq_cpuidle_device); platform_device_register_full(&devinfo); -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v2 01/15] arm: use of_platform_default_populate() to populate default bus 2016-01-27 7:53 ` [PATCH v2 " Kefeng Wang @ 2016-02-01 13:53 ` Shawn Guo 2016-02-01 14:22 ` Heiko Stübner ` (2 subsequent siblings) 3 siblings, 0 replies; 37+ messages in thread From: Shawn Guo @ 2016-02-01 13:53 UTC (permalink / raw) To: linux-arm-kernel On Wed, Jan 27, 2016 at 03:53:00PM +0800, Kefeng Wang wrote: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Cc: Ray Jui <rjui@broadcom.com> > Cc: Lee Jones <lee@kernel.org> > Cc: Krzysztof Halasa <khalasa@piap.pl> > Cc: Kukjin Kim <kgene@kernel.org> > Cc: Rob Herring <robh@kernel.org> > Cc: Shawn Guo <shawnguo@kernel.org> ... > arch/arm/mach-imx/imx27-dt.c | 2 +- > arch/arm/mach-imx/mach-imx51.c | 2 +- > arch/arm/mach-imx/mach-imx53.c | 2 +- > arch/arm/mach-imx/mach-imx6q.c | 2 +- > arch/arm/mach-imx/mach-imx6sl.c | 2 +- > arch/arm/mach-imx/mach-imx6sx.c | 2 +- > arch/arm/mach-imx/mach-imx6ul.c | 2 +- > arch/arm/mach-imx/mach-imx7d.c | 2 +- ... > arch/arm/mach-mxs/mach-mxs.c | 3 +-- Acked-by: Shawn Guo <shawnguo@kernel.org> ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 01/15] arm: use of_platform_default_populate() to populate default bus 2016-01-27 7:53 ` [PATCH v2 " Kefeng Wang 2016-02-01 13:53 ` Shawn Guo @ 2016-02-01 14:22 ` Heiko Stübner 2016-02-16 9:32 ` Krzysztof Hałasa 2016-02-22 12:43 ` Nicolas Ferre 3 siblings, 0 replies; 37+ messages in thread From: Heiko Stübner @ 2016-02-01 14:22 UTC (permalink / raw) To: linux-arm-kernel Am Mittwoch, 27. Januar 2016, 15:53:00 schrieb Kefeng Wang: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- > diff --git a/arch/arm/mach-rockchip/rockchip.c > b/arch/arm/mach-rockchip/rockchip.c index 3f07cc5..07ef8ef 100644 > --- a/arch/arm/mach-rockchip/rockchip.c > +++ b/arch/arm/mach-rockchip/rockchip.c > @@ -73,7 +73,7 @@ static void __init rockchip_timer_init(void) > static void __init rockchip_dt_init(void) > { > rockchip_suspend_init(); > - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > + of_platform_default_populate(NULL, NULL, NULL); > platform_device_register_simple("cpufreq-dt", 0, NULL, 0); > } sounds sensible, so Acked-by: Heiko Stuebner <heiko@sntech.de> ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 01/15] arm: use of_platform_default_populate() to populate default bus 2016-01-27 7:53 ` [PATCH v2 " Kefeng Wang 2016-02-01 13:53 ` Shawn Guo 2016-02-01 14:22 ` Heiko Stübner @ 2016-02-16 9:32 ` Krzysztof Hałasa 2016-02-22 12:43 ` Nicolas Ferre 3 siblings, 0 replies; 37+ messages in thread From: Krzysztof Hałasa @ 2016-02-16 9:32 UTC (permalink / raw) To: linux-arm-kernel Kefeng Wang <wangkefeng.wang@huawei.com> writes: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > --- a/arch/arm/mach-cns3xxx/core.c > +++ b/arch/arm/mach-cns3xxx/core.c > @@ -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); > } > Doesn't look wrong :-) Acked-by: Krzysztof Halasa <khalasa@piap.pl> -- Krzysztof Halasa Industrial Research Institute for Automation and Measurements PIAP Al. Jerozolimskie 202, 02-486 Warsaw, Poland ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 01/15] arm: use of_platform_default_populate() to populate default bus 2016-01-27 7:53 ` [PATCH v2 " Kefeng Wang ` (2 preceding siblings ...) 2016-02-16 9:32 ` Krzysztof Hałasa @ 2016-02-22 12:43 ` Nicolas Ferre 3 siblings, 0 replies; 37+ messages in thread From: Nicolas Ferre @ 2016-02-22 12:43 UTC (permalink / raw) To: linux-arm-kernel Le 27/01/2016 08:53, Kefeng Wang a ?crit : > diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c > index c1a7c6c..1904bc7 100644 > --- a/arch/arm/mach-at91/at91rm9200.c > +++ b/arch/arm/mach-at91/at91rm9200.c > @@ -31,7 +31,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); > > arm_pm_idle = at91rm9200_idle; > at91rm9200_pm_init(); > diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c > index 7eb64f7..d495620 100644 > --- a/arch/arm/mach-at91/at91sam9.c > +++ b/arch/arm/mach-at91/at91sam9.c > @@ -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); > > arm_pm_idle = at91sam9_idle; > } > diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c > index d9cf679..6db395e 100644 > --- a/arch/arm/mach-at91/sama5.c > +++ b/arch/arm/mach-at91/sama5.c > @@ -50,7 +50,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); > at91sam9x5_pm_init(); > } For AT91: Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Thanks, bye. -- Nicolas Ferre ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 02/15] arm64: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang 2016-01-27 4:27 ` [PATCH 01/15] arm: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 10:38 ` Catalin Marinas 2016-01-27 4:27 ` [PATCH 03/15] mips: " Kefeng Wang ` (12 subsequent siblings) 14 siblings, 1 reply; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/arm64/kernel/setup.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 8119479..43a3058 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -359,8 +359,7 @@ static int __init arm64_device_init(void) { if (of_have_populated_dt()) { of_iommu_init(); - of_platform_populate(NULL, of_default_bus_match_table, - NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); } else if (acpi_disabled) { pr_crit("Device tree not populated\n"); } -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 02/15] arm64: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 ` [PATCH 02/15] arm64: " Kefeng Wang @ 2016-01-27 10:38 ` Catalin Marinas 0 siblings, 0 replies; 37+ messages in thread From: Catalin Marinas @ 2016-01-27 10:38 UTC (permalink / raw) To: linux-arm-kernel On Wed, Jan 27, 2016 at 12:27:39PM +0800, Kefeng Wang wrote: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 03/15] mips: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang 2016-01-27 4:27 ` [PATCH 01/15] arm: " Kefeng Wang 2016-01-27 4:27 ` [PATCH 02/15] arm64: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-29 16:00 ` Joshua Henderson 2016-01-27 4:27 ` [PATCH 04/15] arc: " Kefeng Wang ` (11 subsequent siblings) 14 siblings, 1 reply; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/mips/ath79/setup.c | 2 +- arch/mips/jz4740/setup.c | 2 +- arch/mips/mti-sead3/sead3-setup.c | 2 +- arch/mips/pic32/pic32mzda/init.c | 3 +-- arch/mips/pistachio/init.c | 2 +- arch/mips/xilfpga/init.c | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c index be451ee4a..51deb50 100644 --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c @@ -248,7 +248,7 @@ void __init plat_time_init(void) static int __init ath79_setup(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); if (mips_machtype == ATH79_MACH_GENERIC_OF) return 0; diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c index 510fc0d..d175c74 100644 --- a/arch/mips/jz4740/setup.c +++ b/arch/mips/jz4740/setup.c @@ -76,7 +76,7 @@ void __init device_tree_init(void) static int __init populate_machine(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); return 0; } arch_initcall(populate_machine); diff --git a/arch/mips/mti-sead3/sead3-setup.c b/arch/mips/mti-sead3/sead3-setup.c index e43f480..bc73f32 100644 --- a/arch/mips/mti-sead3/sead3-setup.c +++ b/arch/mips/mti-sead3/sead3-setup.c @@ -105,7 +105,7 @@ void __init device_tree_init(void) static int __init customize_machine(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); return 0; } arch_initcall(customize_machine); diff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/init.c index 775ff90..77ecf32 100644 --- a/arch/mips/pic32/pic32mzda/init.c +++ b/arch/mips/pic32/pic32mzda/init.c @@ -147,8 +147,7 @@ static int __init plat_of_setup(void) panic("Device tree not present"); pic32_of_prepare_platform_data(pic32_auxdata_lookup); - if (of_platform_populate(NULL, of_default_bus_match_table, - pic32_auxdata_lookup, NULL)) + if (of_platform_default_populate(NULL, pic32_auxdata_lookup, NULL)) panic("Failed to populate DT"); return 0; diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c index 96ba2cc..0bc25e3 100644 --- a/arch/mips/pistachio/init.c +++ b/arch/mips/pistachio/init.c @@ -128,7 +128,7 @@ static int __init plat_of_setup(void) if (!of_have_populated_dt()) panic("Device tree not present"); - if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL)) + if (of_platform_default_populate(NULL, NULL, NULL)) panic("Failed to populate DT"); return 0; diff --git a/arch/mips/xilfpga/init.c b/arch/mips/xilfpga/init.c index ce2aee2..a97382f 100644 --- a/arch/mips/xilfpga/init.c +++ b/arch/mips/xilfpga/init.c @@ -49,7 +49,7 @@ static int __init plat_of_setup(void) if (!of_have_populated_dt()) panic("Device tree not present"); - if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL)) + if (of_platform_default_populate(NULL, NULL, NULL)) panic("Failed to populate DT"); return 0; -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 03/15] mips: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 ` [PATCH 03/15] mips: " Kefeng Wang @ 2016-01-29 16:00 ` Joshua Henderson 2016-01-30 2:52 ` Kefeng Wang 0 siblings, 1 reply; 37+ messages in thread From: Joshua Henderson @ 2016-01-29 16:00 UTC (permalink / raw) To: linux-arm-kernel On 01/26/2016 09:27 PM, Kefeng Wang wrote: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > > Cc: Ralf Baechle <ralf@linux-mips.org> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- > arch/mips/ath79/setup.c | 2 +- > arch/mips/jz4740/setup.c | 2 +- > arch/mips/mti-sead3/sead3-setup.c | 2 +- > arch/mips/pic32/pic32mzda/init.c | 3 +-- > arch/mips/pistachio/init.c | 2 +- > arch/mips/xilfpga/init.c | 2 +- > 6 files changed, 6 insertions(+), 7 deletions(-) > [...] > diff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/init.c > index 775ff90..77ecf32 100644 > --- a/arch/mips/pic32/pic32mzda/init.c > +++ b/arch/mips/pic32/pic32mzda/init.c > @@ -147,8 +147,7 @@ static int __init plat_of_setup(void) > panic("Device tree not present"); > > pic32_of_prepare_platform_data(pic32_auxdata_lookup); > - if (of_platform_populate(NULL, of_default_bus_match_table, > - pic32_auxdata_lookup, NULL)) > + if (of_platform_default_populate(NULL, pic32_auxdata_lookup, NULL)) > panic("Failed to populate DT"); > > return 0; I'll one-up just compile-testing for this. Tested-by: Joshua Henderson <joshua.henderson@microchip.com> [...] ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 03/15] mips: use of_platform_default_populate() to populate default bus 2016-01-29 16:00 ` Joshua Henderson @ 2016-01-30 2:52 ` Kefeng Wang 0 siblings, 0 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-30 2:52 UTC (permalink / raw) To: linux-arm-kernel On 2016/1/30 0:00, Joshua Henderson wrote: > On 01/26/2016 09:27 PM, Kefeng Wang wrote: >> Use helper of_platform_default_populate() in linux/of_platform >> when possible, instead of calling of_platform_populate() with >> the default match table. >> >> Cc: Ralf Baechle <ralf@linux-mips.org> >> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> >> --- >> arch/mips/ath79/setup.c | 2 +- >> arch/mips/jz4740/setup.c | 2 +- >> arch/mips/mti-sead3/sead3-setup.c | 2 +- >> arch/mips/pic32/pic32mzda/init.c | 3 +-- >> arch/mips/pistachio/init.c | 2 +- >> arch/mips/xilfpga/init.c | 2 +- >> 6 files changed, 6 insertions(+), 7 deletions(-) >> > > [...] > >> diff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/init.c >> index 775ff90..77ecf32 100644 >> --- a/arch/mips/pic32/pic32mzda/init.c >> +++ b/arch/mips/pic32/pic32mzda/init.c >> @@ -147,8 +147,7 @@ static int __init plat_of_setup(void) >> panic("Device tree not present"); >> >> pic32_of_prepare_platform_data(pic32_auxdata_lookup); >> - if (of_platform_populate(NULL, of_default_bus_match_table, >> - pic32_auxdata_lookup, NULL)) >> + if (of_platform_default_populate(NULL, pic32_auxdata_lookup, NULL)) >> panic("Failed to populate DT"); >> >> return 0; > > I'll one-up just compile-testing for this. Hi Joshua, Many thanks. > > Tested-by: Joshua Henderson <joshua.henderson@microchip.com> > > [...] > > > . > ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 04/15] arc: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (2 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 03/15] mips: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 7:56 ` Vineet Gupta 2016-01-27 4:27 ` [PATCH 05/15] c6x: " Kefeng Wang ` (10 subsequent siblings) 14 siblings, 1 reply; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Vineet Gupta <vgupta@synopsys.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/arc/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c index e1b8744..7134973 100644 --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c @@ -438,7 +438,7 @@ static int __init customize_machine(void) * Traverses flattened DeviceTree - registering platform devices * (if any) complete with their resources */ - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); if (machine_desc->init_machine) machine_desc->init_machine(); -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 04/15] arc: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 ` [PATCH 04/15] arc: " Kefeng Wang @ 2016-01-27 7:56 ` Vineet Gupta 0 siblings, 0 replies; 37+ messages in thread From: Vineet Gupta @ 2016-01-27 7:56 UTC (permalink / raw) To: linux-arm-kernel On Wednesday 27 January 2016 09:56 AM, Kefeng Wang wrote: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > > Cc: Vineet Gupta <vgupta@synopsys.com> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- Acked-by: Vineet Gupta <vgupta@synopsys.com> Thx, -Vineet ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 05/15] c6x: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (3 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 04/15] arc: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-02-11 22:52 ` Mark Salter 2016-01-27 4:27 ` [PATCH 06/15] metag: " Kefeng Wang ` (9 subsequent siblings) 14 siblings, 1 reply; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Mark Salter <msalter@redhat.com> Cc: Aurelien Jacquiot <a-jacquiot@ti.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/c6x/platforms/platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/c6x/platforms/platform.c b/arch/c6x/platforms/platform.c index 26c1a35..8412334 100644 --- a/arch/c6x/platforms/platform.c +++ b/arch/c6x/platforms/platform.c @@ -11,7 +11,7 @@ static int __init c6x_device_probe(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); return 0; } core_initcall(c6x_device_probe); -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 05/15] c6x: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 ` [PATCH 05/15] c6x: " Kefeng Wang @ 2016-02-11 22:52 ` Mark Salter 0 siblings, 0 replies; 37+ messages in thread From: Mark Salter @ 2016-02-11 22:52 UTC (permalink / raw) To: linux-arm-kernel On Wed, 2016-01-27 at 12:27 +0800, Kefeng Wang wrote: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > > Cc: Mark Salter <msalter@redhat.com> > Cc: Aurelien Jacquiot <a-jacquiot@ti.com> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- Acked-by: Mark Salter <msalter@redhat.com> > ?arch/c6x/platforms/platform.c | 2 +- > ?1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/c6x/platforms/platform.c b/arch/c6x/platforms/platform.c > index 26c1a35..8412334 100644 > --- a/arch/c6x/platforms/platform.c > +++ b/arch/c6x/platforms/platform.c > @@ -11,7 +11,7 @@ > ? > ?static int __init c6x_device_probe(void) > ?{ > - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > + of_platform_default_populate(NULL, NULL, NULL); > ? return 0; > ?} > ?core_initcall(c6x_device_probe); ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 06/15] metag: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (4 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 05/15] c6x: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 11:34 ` James Hogan 2016-01-27 4:27 ` [PATCH 07/15] cris: " Kefeng Wang ` (8 subsequent siblings) 14 siblings, 1 reply; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: James Hogan <james.hogan@imgtec.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/metag/kernel/setup.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c index 31cf53d..c88f937 100644 --- a/arch/metag/kernel/setup.c +++ b/arch/metag/kernel/setup.c @@ -415,8 +415,7 @@ static int __init customize_machine(void) if (machine_desc->init_machine) machine_desc->init_machine(); else - of_platform_populate(NULL, of_default_bus_match_table, NULL, - NULL); + of_platform_default_populate(NULL, NULL, NULL); return 0; } arch_initcall(customize_machine); -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 06/15] metag: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 ` [PATCH 06/15] metag: " Kefeng Wang @ 2016-01-27 11:34 ` James Hogan 0 siblings, 0 replies; 37+ messages in thread From: James Hogan @ 2016-01-27 11:34 UTC (permalink / raw) To: linux-arm-kernel On Wed, Jan 27, 2016 at 12:27:43PM +0800, Kefeng Wang wrote: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > > Cc: James Hogan <james.hogan@imgtec.com> Acked-by: James Hogan <james.hogan@imgtec.com> Cheers James > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- > arch/metag/kernel/setup.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c > index 31cf53d..c88f937 100644 > --- a/arch/metag/kernel/setup.c > +++ b/arch/metag/kernel/setup.c > @@ -415,8 +415,7 @@ static int __init customize_machine(void) > if (machine_desc->init_machine) > machine_desc->init_machine(); > else > - of_platform_populate(NULL, of_default_bus_match_table, NULL, > - NULL); > + of_platform_default_populate(NULL, NULL, NULL); > return 0; > } > arch_initcall(customize_machine); > -- > 2.6.0.GIT > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160127/b572df4b/attachment.sig> ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 07/15] cris: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (5 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 06/15] metag: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 4:27 ` [PATCH 08/15] nios2: " Kefeng Wang ` (7 subsequent siblings) 14 siblings, 0 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/cris/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c index bb12aa9..5ee5dfc 100644 --- a/arch/cris/kernel/setup.c +++ b/arch/cris/kernel/setup.c @@ -215,7 +215,7 @@ subsys_initcall(topology_init); static int __init cris_of_init(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); return 0; } core_initcall(cris_of_init); -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 08/15] nios2: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (6 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 07/15] cris: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 4:27 ` [PATCH 09/15] xtensa: " Kefeng Wang ` (6 subsequent siblings) 14 siblings, 0 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Ley Foon Tan <lftan@altera.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/nios2/platform/platform.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/nios2/platform/platform.c b/arch/nios2/platform/platform.c index d478773..c62279c 100644 --- a/arch/nios2/platform/platform.c +++ b/arch/nios2/platform/platform.c @@ -39,8 +39,7 @@ static int __init nios2_soc_device_init(void) } } - return of_platform_populate(NULL, of_default_bus_match_table, - NULL, NULL); + return of_platform_default_populate(NULL, NULL, NULL); } device_initcall(nios2_soc_device_init); -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 09/15] xtensa: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (7 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 08/15] nios2: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 4:33 ` Max Filippov 2016-01-27 4:27 ` [PATCH 10/15] bus: imx-weim: " Kefeng Wang ` (5 subsequent siblings) 14 siblings, 1 reply; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Chris Zankel <chris@zankel.net> Cc: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/xtensa/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 9735691..1b17fe9 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -255,7 +255,7 @@ void __init early_init_devtree(void *params) static int __init xtensa_device_probe(void) { of_clk_init(NULL); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); return 0; } -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 09/15] xtensa: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 ` [PATCH 09/15] xtensa: " Kefeng Wang @ 2016-01-27 4:33 ` Max Filippov 0 siblings, 0 replies; 37+ messages in thread From: Max Filippov @ 2016-01-27 4:33 UTC (permalink / raw) To: linux-arm-kernel On Wed, Jan 27, 2016 at 7:27 AM, Kefeng Wang <wangkefeng.wang@huawei.com> wrote: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > > Cc: Chris Zankel <chris@zankel.net> > Cc: Max Filippov <jcmvbkbc@gmail.com> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- > arch/xtensa/kernel/setup.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Max Filippov <jcmvbkbc@gmail.com> -- Thanks. -- Max ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 10/15] bus: imx-weim: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (8 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 09/15] xtensa: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-02-01 13:55 ` Shawn Guo 2016-01-27 4:27 ` [PATCH 11/15] bus: uniphier-system-bus: " Kefeng Wang ` (4 subsequent siblings) 14 siblings, 1 reply; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Signed-off-by: Huang Shijie <b32955@freescale.com> Cc: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- drivers/bus/imx-weim.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index e98d15e..557a71c 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -163,9 +163,8 @@ static int __init weim_parse_dt(struct platform_device *pdev, } if (have_child) - ret = of_platform_populate(pdev->dev.of_node, - of_default_bus_match_table, - NULL, &pdev->dev); + ret = of_platform_default_populate(pdev->dev.of_node, + NULL, &pdev->dev); if (ret) dev_err(&pdev->dev, "%s fail to create devices.\n", pdev->dev.of_node->full_name); -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 10/15] bus: imx-weim: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 ` [PATCH 10/15] bus: imx-weim: " Kefeng Wang @ 2016-02-01 13:55 ` Shawn Guo 0 siblings, 0 replies; 37+ messages in thread From: Shawn Guo @ 2016-02-01 13:55 UTC (permalink / raw) To: linux-arm-kernel On Wed, Jan 27, 2016 at 12:27:47PM +0800, Kefeng Wang wrote: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > > Cc: Signed-off-by: Huang Shijie <b32955@freescale.com> > Cc: Shawn Guo <shawn.guo@linaro.org> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Acked-by: Shawn Guo <shawn.guo@linaro.org> > --- > drivers/bus/imx-weim.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c > index e98d15e..557a71c 100644 > --- a/drivers/bus/imx-weim.c > +++ b/drivers/bus/imx-weim.c > @@ -163,9 +163,8 @@ static int __init weim_parse_dt(struct platform_device *pdev, > } > > if (have_child) > - ret = of_platform_populate(pdev->dev.of_node, > - of_default_bus_match_table, > - NULL, &pdev->dev); > + ret = of_platform_default_populate(pdev->dev.of_node, > + NULL, &pdev->dev); > if (ret) > dev_err(&pdev->dev, "%s fail to create devices.\n", > pdev->dev.of_node->full_name); > -- > 2.6.0.GIT > > ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 11/15] bus: uniphier-system-bus: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (9 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 10/15] bus: imx-weim: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 13:40 ` Masahiro Yamada 2016-01-27 4:27 ` [PATCH 12/15] memory: omap-gpmc: " Kefeng Wang ` (3 subsequent siblings) 14 siblings, 1 reply; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- drivers/bus/uniphier-system-bus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/bus/uniphier-system-bus.c b/drivers/bus/uniphier-system-bus.c index 834a2ae..f50bd6d 100644 --- a/drivers/bus/uniphier-system-bus.c +++ b/drivers/bus/uniphier-system-bus.c @@ -257,8 +257,7 @@ static int uniphier_system_bus_probe(struct platform_device *pdev) uniphier_system_bus_set_reg(priv); /* Now, the bus is configured. Populate platform_devices below it */ - return of_platform_populate(dev->of_node, of_default_bus_match_table, - NULL, dev); + return of_platform_default_populate(dev->of_node, NULL, dev); } static const struct of_device_id uniphier_system_bus_match[] = { -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 11/15] bus: uniphier-system-bus: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 ` [PATCH 11/15] bus: uniphier-system-bus: " Kefeng Wang @ 2016-01-27 13:40 ` Masahiro Yamada 0 siblings, 0 replies; 37+ messages in thread From: Masahiro Yamada @ 2016-01-27 13:40 UTC (permalink / raw) To: linux-arm-kernel Hi Kefeng, 2016-01-27 13:27 GMT+09:00 Kefeng Wang <wangkefeng.wang@huawei.com>: > Use helper of_platform_default_populate() in linux/of_platform > when possible, instead of calling of_platform_populate() with > the default match table. > > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- > drivers/bus/uniphier-system-bus.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/bus/uniphier-system-bus.c b/drivers/bus/uniphier-system-bus.c > index 834a2ae..f50bd6d 100644 > --- a/drivers/bus/uniphier-system-bus.c > +++ b/drivers/bus/uniphier-system-bus.c > @@ -257,8 +257,7 @@ static int uniphier_system_bus_probe(struct platform_device *pdev) > uniphier_system_bus_set_reg(priv); > > /* Now, the bus is configured. Populate platform_devices below it */ > - return of_platform_populate(dev->of_node, of_default_bus_match_table, > - NULL, dev); > + return of_platform_default_populate(dev->of_node, NULL, dev); > } > > static const struct of_device_id uniphier_system_bus_match[] = { I did not notice the existence of of_platform_default_populate(). If I had used this function, commit b80443cc22 would have not been needed in the first place... Thanks for cleaning this! Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 12/15] memory: omap-gpmc: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (10 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 11/15] bus: uniphier-system-bus: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 4:27 ` [PATCH 13/15] of: unittest: " Kefeng Wang ` (2 subsequent siblings) 14 siblings, 0 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Roger Quadros <rogerq@ti.com> Cc: Tony Lindgren <tony@atomide.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- drivers/memory/omap-gpmc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 6515dfc..455fc73 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -2016,8 +2016,7 @@ no_timings: /* is child a common bus? */ if (of_match_node(of_default_bus_match_table, child)) /* create children and other common bus children */ - if (of_platform_populate(child, of_default_bus_match_table, - NULL, &pdev->dev)) + if (of_platform_default_populate(child, NULL, &pdev->dev)) goto err_child_fail; return 0; -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 13/15] of: unittest: use of_platform_default_populate() to populate default bus 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (11 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 12/15] memory: omap-gpmc: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 4:27 ` [PATCH 14/15] Revert "bus: uniphier: allow only built-in driver" Kefeng Wang 2016-01-27 4:27 ` [PATCH 15/15] Revert "of/platform: export of_default_bus_match_table" Kefeng Wang 14 siblings, 0 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel Use helper of_platform_default_populate() in linux/of_platform when possible, instead of calling of_platform_populate() with the default match table. Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: Grant Likely <grant.likely@linaro.org> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- drivers/of/unittest.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 979b6e4..31837c8 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -772,7 +772,7 @@ static void __init of_unittest_platform_populate(void) }; np = of_find_node_by_path("/testcase-data"); - of_platform_populate(np, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(np, NULL, NULL); /* Test that a missing irq domain returns -EPROBE_DEFER */ np = of_find_node_by_path("/testcase-data/testcase-device1"); @@ -1880,8 +1880,7 @@ static void __init of_unittest_overlay(void) goto out; } - ret = of_platform_populate(bus_np, of_default_bus_match_table, - NULL, NULL); + ret = of_platform_default_populate(bus_np, NULL, NULL); if (ret != 0) { unittest(0, "could not populate bus @ \"%s\"\n", bus_path); goto out; -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 14/15] Revert "bus: uniphier: allow only built-in driver" 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (12 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 13/15] of: unittest: " Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 13:48 ` Masahiro Yamada 2016-01-27 4:27 ` [PATCH 15/15] Revert "of/platform: export of_default_bus_match_table" Kefeng Wang 14 siblings, 1 reply; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel This reverts commit 326ea45aa827da6686c78b5907f9839f91ef5782. After covering to use helper of_platform_default_populate() to populate the default bus, no error in build uniphier driver as a module. Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- drivers/bus/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index 129d47b..9a92c07 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -132,7 +132,7 @@ config SUNXI_RSB and AC100/AC200 ICs. config UNIPHIER_SYSTEM_BUS - bool "UniPhier System Bus driver" + tristate "UniPhier System Bus driver" depends on ARCH_UNIPHIER && OF default y help -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 14/15] Revert "bus: uniphier: allow only built-in driver" 2016-01-27 4:27 ` [PATCH 14/15] Revert "bus: uniphier: allow only built-in driver" Kefeng Wang @ 2016-01-27 13:48 ` Masahiro Yamada 2016-01-28 1:41 ` Kefeng Wang 0 siblings, 1 reply; 37+ messages in thread From: Masahiro Yamada @ 2016-01-27 13:48 UTC (permalink / raw) To: linux-arm-kernel 2016-01-27 13:27 GMT+09:00 Kefeng Wang <wangkefeng.wang@huawei.com>: > This reverts commit 326ea45aa827da6686c78b5907f9839f91ef5782. > > After covering to use helper of_platform_default_populate() to > populate the default bus, no error in build uniphier driver as > a module. This statement is weird. There is no error for building this driver as a module at the point of v4.5-rc1. The of_platform_default_populate() conversion (11/15) is unrelated to fixing the build error. BTW, I had already posted an equivalent patch a few days before: https://patchwork.kernel.org/patch/8096991/ > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> > Cc: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- > drivers/bus/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig > index 129d47b..9a92c07 100644 > --- a/drivers/bus/Kconfig > +++ b/drivers/bus/Kconfig > @@ -132,7 +132,7 @@ config SUNXI_RSB > and AC100/AC200 ICs. > > config UNIPHIER_SYSTEM_BUS > - bool "UniPhier System Bus driver" > + tristate "UniPhier System Bus driver" > depends on ARCH_UNIPHIER && OF > default y > help > -- > 2.6.0.GIT > -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 14/15] Revert "bus: uniphier: allow only built-in driver" 2016-01-27 13:48 ` Masahiro Yamada @ 2016-01-28 1:41 ` Kefeng Wang 0 siblings, 0 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-28 1:41 UTC (permalink / raw) To: linux-arm-kernel Hi Masahiro, On 2016/1/27 21:48, Masahiro Yamada wrote: > 2016-01-27 13:27 GMT+09:00 Kefeng Wang <wangkefeng.wang@huawei.com>: >> This reverts commit 326ea45aa827da6686c78b5907f9839f91ef5782. >> >> After covering to use helper of_platform_default_populate() to >> populate the default bus, no error in build uniphier driver as >> a module. > > This statement is weird. > There is no error for building this driver as a module > at the point of v4.5-rc1. Yes, but after drop export of_default_bus_match_table in patchset(15/15), we will meet build issue, so the statement can be changed to ------------ After covering to use helper of_platform_default_populate() to populate the default bus, this driver can be safely as a tristate one, no error in build uniphier driver as a module once we drop export of_default_bus_match_table in later patch. ------------ > > The of_platform_default_populate() conversion (11/15) is unrelated > to fixing the build error. > > BTW, I had already posted an equivalent patch a few days before: > > https://patchwork.kernel.org/patch/8096991/ > I didn't notice this before, it is ok for me to use your patch, or I will send a new one with update changlog, thanks for your review. > > > >> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> >> Cc: Arnd Bergmann <arnd@arndb.de> >> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> >> --- >> drivers/bus/Kconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig >> index 129d47b..9a92c07 100644 >> --- a/drivers/bus/Kconfig >> +++ b/drivers/bus/Kconfig >> @@ -132,7 +132,7 @@ config SUNXI_RSB >> and AC100/AC200 ICs. >> >> config UNIPHIER_SYSTEM_BUS >> - bool "UniPhier System Bus driver" >> + tristate "UniPhier System Bus driver" >> depends on ARCH_UNIPHIER && OF >> default y >> help >> -- >> 2.6.0.GIT >> > > ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 15/15] Revert "of/platform: export of_default_bus_match_table" 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang ` (13 preceding siblings ...) 2016-01-27 4:27 ` [PATCH 14/15] Revert "bus: uniphier: allow only built-in driver" Kefeng Wang @ 2016-01-27 4:27 ` Kefeng Wang 2016-01-27 13:50 ` Masahiro Yamada 2016-01-27 22:10 ` Hauke Mehrtens 14 siblings, 2 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-27 4:27 UTC (permalink / raw) To: linux-arm-kernel This reverts commit b80443c2211c7daaabd20fbbe9e7beb3fa3408e0. After covering to use helper of_platform_default_populate() to populate the default bus, no need to export of_default_bus_match_table anymore. Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: Grant Likely <grant.likely@linaro.org> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- drivers/of/platform.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 8d103e4..af98343 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -31,7 +31,6 @@ const struct of_device_id of_default_bus_match_table[] = { #endif /* CONFIG_ARM_AMBA */ {} /* Empty terminated list */ }; -EXPORT_SYMBOL(of_default_bus_match_table); static int of_dev_node_match(struct device *dev, void *data) { -- 2.6.0.GIT ^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 15/15] Revert "of/platform: export of_default_bus_match_table" 2016-01-27 4:27 ` [PATCH 15/15] Revert "of/platform: export of_default_bus_match_table" Kefeng Wang @ 2016-01-27 13:50 ` Masahiro Yamada 2016-01-27 22:10 ` Hauke Mehrtens 1 sibling, 0 replies; 37+ messages in thread From: Masahiro Yamada @ 2016-01-27 13:50 UTC (permalink / raw) To: linux-arm-kernel 2016-01-27 13:27 GMT+09:00 Kefeng Wang <wangkefeng.wang@huawei.com>: > This reverts commit b80443c2211c7daaabd20fbbe9e7beb3fa3408e0. > > After covering to use helper of_platform_default_populate() to populate > the default bus, no need to export of_default_bus_match_table anymore. > > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Frank Rowand <frowand.list@gmail.com> > Cc: Grant Likely <grant.likely@linaro.org> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com> -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 15/15] Revert "of/platform: export of_default_bus_match_table" 2016-01-27 4:27 ` [PATCH 15/15] Revert "of/platform: export of_default_bus_match_table" Kefeng Wang 2016-01-27 13:50 ` Masahiro Yamada @ 2016-01-27 22:10 ` Hauke Mehrtens 2016-01-28 2:11 ` Kefeng Wang 1 sibling, 1 reply; 37+ messages in thread From: Hauke Mehrtens @ 2016-01-27 22:10 UTC (permalink / raw) To: linux-arm-kernel On 01/27/2016 05:27 AM, Kefeng Wang wrote: > This reverts commit b80443c2211c7daaabd20fbbe9e7beb3fa3408e0. > > After covering to use helper of_platform_default_populate() to populate > the default bus, no need to export of_default_bus_match_table anymore. > > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Frank Rowand <frowand.list@gmail.com> > Cc: Grant Likely <grant.likely@linaro.org> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- > drivers/of/platform.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index 8d103e4..af98343 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -31,7 +31,6 @@ const struct of_device_id of_default_bus_match_table[] = { > #endif /* CONFIG_ARM_AMBA */ > {} /* Empty terminated list */ > }; > -EXPORT_SYMBOL(of_default_bus_match_table); > > static int of_dev_node_match(struct device *dev, void *data) > { > Is of_default_bus_match_table still accessed or can it be made static and the header file entry removed? Thanks for cleaning up all the drivers, I just needed it for one driver. Hauke ^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 15/15] Revert "of/platform: export of_default_bus_match_table" 2016-01-27 22:10 ` Hauke Mehrtens @ 2016-01-28 2:11 ` Kefeng Wang 0 siblings, 0 replies; 37+ messages in thread From: Kefeng Wang @ 2016-01-28 2:11 UTC (permalink / raw) To: linux-arm-kernel Hi Hauke, On 2016/1/28 6:10, Hauke Mehrtens wrote: > On 01/27/2016 05:27 AM, Kefeng Wang wrote: >> This reverts commit b80443c2211c7daaabd20fbbe9e7beb3fa3408e0. >> >> After covering to use helper of_platform_default_populate() to populate >> the default bus, no need to export of_default_bus_match_table anymore. >> >> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> >> Cc: Rob Herring <robh+dt@kernel.org> >> Cc: Frank Rowand <frowand.list@gmail.com> >> Cc: Grant Likely <grant.likely@linaro.org> >> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> >> --- >> drivers/of/platform.c | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/drivers/of/platform.c b/drivers/of/platform.c >> index 8d103e4..af98343 100644 >> --- a/drivers/of/platform.c >> +++ b/drivers/of/platform.c >> @@ -31,7 +31,6 @@ const struct of_device_id of_default_bus_match_table[] = { >> #endif /* CONFIG_ARM_AMBA */ >> {} /* Empty terminated list */ >> }; >> -EXPORT_SYMBOL(of_default_bus_match_table); >> >> static int of_dev_node_match(struct device *dev, void *data) >> { >> > > Is of_default_bus_match_table still accessed or can it be made static > and the header file entry removed? Thanks for your review. There is still a user in drivers/memory/omap-gpmc.c, but it(OMAP_GPMC) only can be selected by ARCH_OMAP2PLUS, keep of_default_bus_match_table in header file. > > Thanks for cleaning up all the drivers, I just needed it for one driver. > > Hauke > > . > ^ permalink raw reply [flat|nested] 37+ messages in thread
end of thread, other threads:[~2016-02-22 12:43 UTC | newest] Thread overview: 37+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-27 4:27 [PATCH 00/15] use of_platform_default_populate() to populate default bus Kefeng Wang 2016-01-27 4:27 ` [PATCH 01/15] arm: " Kefeng Wang 2016-01-27 7:08 ` kbuild test robot 2016-01-27 7:50 ` Kefeng Wang 2016-01-27 7:53 ` [PATCH v2 " Kefeng Wang 2016-02-01 13:53 ` Shawn Guo 2016-02-01 14:22 ` Heiko Stübner 2016-02-16 9:32 ` Krzysztof Hałasa 2016-02-22 12:43 ` Nicolas Ferre 2016-01-27 4:27 ` [PATCH 02/15] arm64: " Kefeng Wang 2016-01-27 10:38 ` Catalin Marinas 2016-01-27 4:27 ` [PATCH 03/15] mips: " Kefeng Wang 2016-01-29 16:00 ` Joshua Henderson 2016-01-30 2:52 ` Kefeng Wang 2016-01-27 4:27 ` [PATCH 04/15] arc: " Kefeng Wang 2016-01-27 7:56 ` Vineet Gupta 2016-01-27 4:27 ` [PATCH 05/15] c6x: " Kefeng Wang 2016-02-11 22:52 ` Mark Salter 2016-01-27 4:27 ` [PATCH 06/15] metag: " Kefeng Wang 2016-01-27 11:34 ` James Hogan 2016-01-27 4:27 ` [PATCH 07/15] cris: " Kefeng Wang 2016-01-27 4:27 ` [PATCH 08/15] nios2: " Kefeng Wang 2016-01-27 4:27 ` [PATCH 09/15] xtensa: " Kefeng Wang 2016-01-27 4:33 ` Max Filippov 2016-01-27 4:27 ` [PATCH 10/15] bus: imx-weim: " Kefeng Wang 2016-02-01 13:55 ` Shawn Guo 2016-01-27 4:27 ` [PATCH 11/15] bus: uniphier-system-bus: " Kefeng Wang 2016-01-27 13:40 ` Masahiro Yamada 2016-01-27 4:27 ` [PATCH 12/15] memory: omap-gpmc: " Kefeng Wang 2016-01-27 4:27 ` [PATCH 13/15] of: unittest: " Kefeng Wang 2016-01-27 4:27 ` [PATCH 14/15] Revert "bus: uniphier: allow only built-in driver" Kefeng Wang 2016-01-27 13:48 ` Masahiro Yamada 2016-01-28 1:41 ` Kefeng Wang 2016-01-27 4:27 ` [PATCH 15/15] Revert "of/platform: export of_default_bus_match_table" Kefeng Wang 2016-01-27 13:50 ` Masahiro Yamada 2016-01-27 22:10 ` Hauke Mehrtens 2016-01-28 2:11 ` Kefeng Wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).