qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysreset: use psci sysreset as primary for rockchip platforms 

"rockchip_reset" is applied if PSCI is not enabled.

Change-Id: Id219bf6d4c5d75e2b35af41b42ee0fc718800b68
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2018-09-26 17:00:15 +08:00 committed by Jianhong Chen
parent aeed442f96
commit bbef4bcaa1
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/sysreset/Makefile
View File

@ -5,7 +5,9 @@
# #
obj-$(CONFIG_$(SPL_TPL_)SYSRESET) += sysreset-uclass.o obj-$(CONFIG_$(SPL_TPL_)SYSRESET) += sysreset-uclass.o
ifndef CONFIG_TPL_BUILD
obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o
endif
obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o
obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o

14
drivers/sysreset/sysreset-uclass.c
View File

@ -30,6 +30,20 @@ int sysreset_walk(enum sysreset_t type)
struct udevice *dev; struct udevice *dev;
int ret = -ENOSYS; int ret = -ENOSYS;
/*
* Use psci sysreset as primary for rockchip platforms,
* "rockchip_reset" is applied if PSCI is disabled.
*/
#if !defined(CONFIG_TPL_BUILD) && \
defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_SYSRESET_PSCI)
ret = uclass_get_device_by_driver(UCLASS_SYSRESET,
DM_GET_DRIVER(psci_sysreset), &dev);
if (!ret)
sysreset_request(dev, type);
else
printf("WARN: PSCI sysreset is disabled\n");
#endif
while (ret != -EINPROGRESS && type < SYSRESET_COUNT) { while (ret != -EINPROGRESS && type < SYSRESET_COUNT) {
for (uclass_first_device(UCLASS_SYSRESET, &dev); for (uclass_first_device(UCLASS_SYSRESET, &dev);
dev; dev;