projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
arch
/
arm
/
mach-rockchip
/
rk3399
/
syscon_rk3399.c
diff --git
a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
index 259ca44d68fb99a3ad8781fedfe0c49fec7bdd12..690cbe7f27892944e5cf25ccd40c5c9b80b1e32c 100644
(file)
--- a/
arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
+++ b/
arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
@@
-5,6
+5,7
@@
#include <common.h>
#include <dm.h>
#include <common.h>
#include <dm.h>
+#include <log.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
@@
-20,6
+21,9
@@
static const struct udevice_id rk3399_syscon_ids[] = {
U_BOOT_DRIVER(syscon_rk3399) = {
.name = "rk3399_syscon",
.id = UCLASS_SYSCON,
U_BOOT_DRIVER(syscon_rk3399) = {
.name = "rk3399_syscon",
.id = UCLASS_SYSCON,
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
+ .bind = dm_scan_fdt_dev,
+#endif
.of_match = rk3399_syscon_ids,
};
.of_match = rk3399_syscon_ids,
};