diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-04-04 16:34:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-04-04 16:34:02 +0200 |
| commit | 7312323da9349c3e516247d8ed8af80ef7d15e84 (patch) | |
| tree | 2ffc1ea4d534bac3592c8d8778ed0a5e9817525a /drivers/firmware | |
| parent | 7b019dcf60355e2178477b8dab1364ea2418d2bf (diff) | |
| parent | 748d3c3cce57d7d5d5f9d5ab8f338b2f83b7ef3e (diff) | |
| download | linux-next-7312323da9349c3e516247d8ed8af80ef7d15e84.tar.gz | |
Merge branch 'soc/drivers' into for-next
* soc/drivers: (22 commits)
dt-bindings: memory-controller: Drop unneeded quotes
optee: add per cpu asynchronous notification
dt-bindings: optee driver interrupt can be a per-cpu interrupt
dt-bindings: soc: amlogic: Drop unneeded quotes
memory: stm32-fmc2-ebi: depends on ARCH_STM32 instead of MACH_STM32MP157
firmware: meson_sm: populate platform devices from sm device tree data
bus: ti-sysc: Fix comment typo
bus: ti-sysc: Use list_for_each_entry() helper
soc: amlogic: meson-pwrc: Use dev_err_probe()
bus: ti-sysc: Use of_property_present() for testing DT property presence
bus: ti-sysc: Remove open coded "ranges" parsing
memory: tegra: remove redundant variable initialization
soc: renesas: Use "#ifdef" for single-symbol definition checks
soc: renesas: pwc-rzv2m: drop of_match_ptr for ID table
soc: renesas: mark OF related data as maybe unused
memory: atmel-ebi: Use of_property_present() for testing DT property presence
soc: renesas: rmobile-sysc: Use of_fwnode_handle() helper
soc: renesas: Remove r8a77950 arch
soc: renesas: rcar-sysc: Remove R-Car H3 ES1.* handling
memory: remove MODULE_LICENSE in non-modules
...
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/meson/meson_sm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c index 3f5ff9ed668e..798bcdb05d84 100644 --- a/drivers/firmware/meson/meson_sm.c +++ b/drivers/firmware/meson/meson_sm.c @@ -311,11 +311,14 @@ static int __init meson_sm_probe(struct platform_device *pdev) platform_set_drvdata(pdev, fw); - pr_info("secure-monitor enabled\n"); + if (devm_of_platform_populate(dev)) + goto out_in_base; if (sysfs_create_group(&pdev->dev.kobj, &meson_sm_sysfs_attr_group)) goto out_in_base; + pr_info("secure-monitor enabled\n"); + return 0; out_in_base: |