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

arm: use of_platform_default_populate() to populate

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

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

authored by

Kefeng Wang and committed by
Rob Herring
435ebcbc 69d99e6c

+22 -35
+1 -1
arch/arm/mach-at91/at91rm9200.c
··· 30 30 if (soc != NULL) 31 31 soc_dev = soc_device_to_device(soc); 32 32 33 - of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev); 33 + of_platform_default_populate(NULL, NULL, soc_dev); 34 34 35 35 at91rm9200_pm_init(); 36 36 }
+1 -1
arch/arm/mach-at91/at91sam9.c
··· 61 61 if (soc != NULL) 62 62 soc_dev = soc_device_to_device(soc); 63 63 64 - of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev); 64 + of_platform_default_populate(NULL, NULL, soc_dev); 65 65 } 66 66 67 67 static void __init at91sam9_dt_device_init(void)
+1 -1
arch/arm/mach-at91/sama5.c
··· 68 68 if (soc != NULL) 69 69 soc_dev = soc_device_to_device(soc); 70 70 71 - of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev); 71 + of_platform_default_populate(NULL, NULL, soc_dev); 72 72 sama5_pm_init(); 73 73 } 74 74
+1 -2
arch/arm/mach-cns3xxx/core.c
··· 395 395 396 396 pm_power_off = cns3xxx_power_off; 397 397 398 - of_platform_populate(NULL, of_default_bus_match_table, 399 - cns3xxx_auxdata, NULL); 398 + of_platform_default_populate(NULL, cns3xxx_auxdata, NULL); 400 399 } 401 400 402 401 static const char *const cns3xxx_dt_compat[] __initconst = {
+1 -1
arch/arm/mach-imx/mach-imx6q.c
··· 278 278 279 279 imx6q_enet_phy_init(); 280 280 281 - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); 281 + of_platform_default_populate(NULL, NULL, parent); 282 282 283 283 imx_anatop_init(); 284 284 cpu_is_imx6q() ? imx6q_pm_init() : imx6dl_pm_init();
+1 -1
arch/arm/mach-imx/mach-imx6sl.c
··· 52 52 if (parent == NULL) 53 53 pr_warn("failed to initialize soc device\n"); 54 54 55 - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); 55 + of_platform_default_populate(NULL, NULL, parent); 56 56 57 57 imx6sl_fec_init(); 58 58 imx_anatop_init();
+1 -1
arch/arm/mach-imx/mach-imx6sx.c
··· 72 72 if (parent == NULL) 73 73 pr_warn("failed to initialize soc device\n"); 74 74 75 - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); 75 + of_platform_default_populate(NULL, NULL, parent); 76 76 77 77 imx6sx_enet_init(); 78 78 imx_anatop_init();
+1 -2
arch/arm/mach-integrator/integrator_ap.c
··· 240 240 if (!ebi_base) 241 241 return; 242 242 243 - of_platform_populate(NULL, of_default_bus_match_table, 244 - ap_auxdata_lookup, NULL); 243 + of_platform_default_populate(NULL, ap_auxdata_lookup, NULL); 245 244 246 245 sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET); 247 246 for (i = 0; i < 4; i++) {
+1 -2
arch/arm/mach-integrator/integrator_cp.c
··· 231 231 if (!intcp_con_base) 232 232 return; 233 233 234 - of_platform_populate(NULL, of_default_bus_match_table, 235 - intcp_auxdata_lookup, NULL); 234 + of_platform_default_populate(NULL, intcp_auxdata_lookup, NULL); 236 235 } 237 236 238 237 static const char * intcp_dt_board_compat[] = {
+1 -2
arch/arm/mach-lpc32xx/phy3250.c
··· 191 191 LPC32XX_CLKPWR_TESTCLK_TESTCLK2_EN, 192 192 LPC32XX_CLKPWR_TEST_CLK_SEL); 193 193 194 - of_platform_populate(NULL, of_default_bus_match_table, 195 - lpc32xx_auxdata_lookup, NULL); 194 + of_platform_default_populate(NULL, lpc32xx_auxdata_lookup, NULL); 196 195 } 197 196 198 197 static const char *const lpc32xx_dt_compat[] __initconst = {
+1 -1
arch/arm/mach-mvebu/kirkwood.c
··· 179 179 kirkwood_pm_init(); 180 180 kirkwood_dt_eth_fixup(); 181 181 182 - of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL); 182 + of_platform_default_populate(NULL, auxdata, NULL); 183 183 } 184 184 185 185 static const char * const kirkwood_dt_board_compat[] __initconst = {
+1 -2
arch/arm/mach-mxs/mach-mxs.c
··· 498 498 else if (of_machine_is_compatible("msr,m28cu3")) 499 499 m28cu3_init(); 500 500 501 - of_platform_populate(NULL, of_default_bus_match_table, 502 - NULL, parent); 501 + of_platform_default_populate(NULL, NULL, parent); 503 502 504 503 mxs_restart_init(); 505 504
+1 -2
arch/arm/mach-nspire/nspire.c
··· 57 57 58 58 static void __init nspire_init(void) 59 59 { 60 - of_platform_populate(NULL, of_default_bus_match_table, 61 - nspire_auxdata, NULL); 60 + of_platform_default_populate(NULL, nspire_auxdata, NULL); 62 61 } 63 62 64 63 static void nspire_restart(enum reboot_mode mode, const char *cmd)
+1 -2
arch/arm/mach-orion5x/board-dt.c
··· 63 63 if (of_machine_is_compatible("maxtor,shared-storage-2")) 64 64 mss2_init(); 65 65 66 - of_platform_populate(NULL, of_default_bus_match_table, 67 - orion5x_auxdata_lookup, NULL); 66 + of_platform_default_populate(NULL, orion5x_auxdata_lookup, NULL); 68 67 } 69 68 70 69 static const char *orion5x_dt_compat[] = {
+1 -2
arch/arm/mach-spear/spear300.c
··· 194 194 pl080_plat_data.slave_channels = spear300_dma_info; 195 195 pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear300_dma_info); 196 196 197 - of_platform_populate(NULL, of_default_bus_match_table, 198 - spear300_auxdata_lookup, NULL); 197 + of_platform_default_populate(NULL, spear300_auxdata_lookup, NULL); 199 198 } 200 199 201 200 static const char * const spear300_dt_board_compat[] = {
+1 -2
arch/arm/mach-spear/spear310.c
··· 236 236 pl080_plat_data.slave_channels = spear310_dma_info; 237 237 pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear310_dma_info); 238 238 239 - of_platform_populate(NULL, of_default_bus_match_table, 240 - spear310_auxdata_lookup, NULL); 239 + of_platform_default_populate(NULL, spear310_auxdata_lookup, NULL); 241 240 } 242 241 243 242 static const char * const spear310_dt_board_compat[] = {
+1 -2
arch/arm/mach-spear/spear320.c
··· 240 240 pl080_plat_data.slave_channels = spear320_dma_info; 241 241 pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear320_dma_info); 242 242 243 - of_platform_populate(NULL, of_default_bus_match_table, 244 - spear320_auxdata_lookup, NULL); 243 + of_platform_default_populate(NULL, spear320_auxdata_lookup, NULL); 245 244 } 246 245 247 246 static const char * const spear320_dt_board_compat[] = {
+1 -2
arch/arm/mach-spear/spear6xx.c
··· 411 411 412 412 static void __init spear600_dt_init(void) 413 413 { 414 - of_platform_populate(NULL, of_default_bus_match_table, 415 - spear6xx_auxdata_lookup, NULL); 414 + of_platform_default_populate(NULL, spear6xx_auxdata_lookup, NULL); 416 415 } 417 416 418 417 static const char *spear600_dt_board_compat[] = {
+1 -1
arch/arm/mach-tegra/tegra.c
··· 115 115 * devices 116 116 */ 117 117 out: 118 - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); 118 + of_platform_default_populate(NULL, NULL, parent); 119 119 } 120 120 121 121 static void __init paz00_init(void)
+1 -2
arch/arm/mach-u300/core.c
··· 391 391 pinctrl_register_mappings(u300_pinmux_map, 392 392 ARRAY_SIZE(u300_pinmux_map)); 393 393 394 - of_platform_populate(NULL, of_default_bus_match_table, 395 - u300_auxdata_lookup, NULL); 394 + of_platform_default_populate(NULL, u300_auxdata_lookup, NULL); 396 395 397 396 /* Enable SEMI self refresh */ 398 397 val = readw(syscon_base + U300_SYSCON_SMCR) |
+1 -2
arch/arm/mach-versatile/versatile_dt.c
··· 344 344 345 345 versatile_dt_pci_init(); 346 346 347 - of_platform_populate(NULL, of_default_bus_match_table, 348 - versatile_auxdata_lookup, NULL); 347 + of_platform_default_populate(NULL, versatile_auxdata_lookup, NULL); 349 348 } 350 349 351 350 static const char *const versatile_dt_match[] __initconst = {
+1 -1
arch/arm/mach-zynq/common.c
··· 141 141 * Finished with the static registrations now; fill in the missing 142 142 * devices 143 143 */ 144 - of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); 144 + of_platform_default_populate(NULL, NULL, parent); 145 145 146 146 platform_device_register(&zynq_cpuidle_device); 147 147 }