diff options
author | Tom Rini <trini@konsulko.com> | 2023-01-12 17:05:41 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-01-12 17:05:41 -0500 |
commit | 87c9e117bf57d6bb42c5521a3f6ec9ca7d97e5fa (patch) | |
tree | 9a2a90d475abd35c8945bb3af7aa0c14bfc149f7 /arch/arm/mach-omap2/boot-common.c | |
parent | f58885d002302b8047446a6a15f7376bb7b1ea32 (diff) | |
parent | 48b3ecbedf8208845ac5956a3fb8817269fafedd (diff) |
Merge branch '2023-01-12-further-assorted-general-updates'
- Bring in a number of assorted updates, some of which have been waiting
around for a bit. Make silent console really be silent, get rid of
gpio_hog_probe_all, add RNG for imx6, make net/fm use fs_loader, get
rid of a bad __weak usage and set distro_bootpart_uuid in another case.
Diffstat (limited to 'arch/arm/mach-omap2/boot-common.c')
-rw-r--r-- | arch/arm/mach-omap2/boot-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index d104f23b3e2..9a342a1bf95 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -214,7 +214,7 @@ int load_firmware(char *name_fw, u32 *loadaddr) if (!*loadaddr) return 0; - if (!uclass_get_device(UCLASS_FS_FIRMWARE_LOADER, 0, &fsdev)) { + if (!get_fs_loader(&fsdev)) { size = request_firmware_into_buf(fsdev, name_fw, (void *)*loadaddr, 0, 0); } |