diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 12:22:53 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 12:22:53 +0100 |
| commit | 830ebd37c57709e08c1b010c26ad1659a5853ce1 (patch) | |
| tree | c60b529e8b4bc09293749030d6d27b10d73a009c /drivers/of | |
| parent | 57e36159cc0eed51b37ec9a17214fc0079f75879 (diff) | |
| parent | 3aa0582fdb824139630298880fbf78d4ac774d3c (diff) | |
| download | linux-830ebd37c57709e08c1b010c26ad1659a5853ce1.tar.bz2 | |
Merge tag 'qcom-drivers-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers
Pull "Qualcomm ARM Based Driver Updates for v4.16 - Redo" from Andy Gross:
* Fix error handling code in SMP2P probe
* Update SMP2P to use ACPS as mailbox client
* Add QMI support
* Fixups for Qualcomm SCM
* Fix licensing on rmtfs_mem
* Correct SMSM child node lookup
* Populate firmware nodes during platform init
* tag 'qcom-drivers-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux:
of: platform: populate /firmware/ node from of_platform_default_populate_init()
soc: qcom: smp2p: Use common error handling code in qcom_smp2p_probe()
soc: qcom: Introduce QMI helpers
soc: qcom: Introduce QMI encoder/decoder
firmware: qcom_scm: Add dependent headers to qcom_scm.h
soc: qcom: smp2p: Access APCS as mailbox client
soc: qcom: rmtfs_mem: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
soc: qcom: smsm: fix child-node lookup
firmware: qcom_scm: drop redandant of_platform_populate
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/platform.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index b7cf84b29737..78cfb15c7890 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -518,6 +518,10 @@ static int __init of_platform_default_populate_init(void) for_each_matching_node(node, reserved_mem_matches) of_platform_device_create(node, NULL, NULL); + node = of_find_node_by_path("/firmware"); + if (node) + of_platform_populate(node, NULL, NULL, NULL); + /* Populate everything else. */ of_platform_default_populate(NULL, NULL, NULL); |