diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-17 21:15:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-17 21:15:57 -0500 |
| commit | d64efd920e429f1c5dc085e2e8614c5d139ec37d (patch) | |
| tree | fb1b00b875c2efd1a3d5310227c0d214cd48cf45 /arch/arm/mach-rockchip/misc.c | |
| parent | fd8adc33b8f999cb09c3ba8ea8860ded28e8d6ca (diff) | |
| parent | 59b01eb7a17a7c0915fd8aff8f818699b4624137 (diff) | |
Merge tag 'u-boot-rockchip-20191118' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Add support for rockchip SoC: PX30, RK3308
- Add and migrate to use common dram driver: PX30, RK3328, RK3399
- Add rk3399 board Tinker-s support
- Board config update for Rock960, Rockpro64
Diffstat (limited to 'arch/arm/mach-rockchip/misc.c')
| -rw-r--r-- | arch/arm/mach-rockchip/misc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index c0e4fdbc00..bed4317f7e 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -57,13 +57,18 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset, const u32 cpuid_length, u8 *cpuid) { -#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) +#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP) struct udevice *dev; int ret; /* retrieve the device */ +#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) ret = uclass_get_device_by_driver(UCLASS_MISC, DM_GET_DRIVER(rockchip_efuse), &dev); +#elif CONFIG_IS_ENABLED(ROCKCHIP_OTP) + ret = uclass_get_device_by_driver(UCLASS_MISC, + DM_GET_DRIVER(rockchip_otp), &dev); +#endif if (ret) { debug("%s: could not find efuse device\n", __func__); return -1; |