mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-02-16 12:59:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "ipq6018: enable reset support"

Browse source
This commit is contained in:
Linux Build Service Account 2018-12-23 20:47:42 -08:00 • committed by Gerrit - the friendly Code Review server
commit 95ad2c8c6d
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
board/qca/arm/ipq6018/ipq6018.c
View file

@ -19,6 +19,8 @@
#include <asm/arch-qca-common/qpic_nand.h>
#include <asm/arch-qca-common/gpio.h>
#include <asm/arch-qca-common/uart.h>
#include <asm/arch-qca-common/scm.h>
#include <asm/arch-qca-common/iomap.h>
#include <ipq6018.h>
#include <mmc.h>
#include <sdhci.h>
@ -738,8 +740,28 @@ unsigned long timer_read_counter(void)
return 0;
}
void psci_sys_reset(void)
{
__invoke_psci_fn_smc(0x84000009, 0, 0, 0);
}
void qti_scm_pshold(void)
{
int ret;
ret = scm_call(SCM_SVC_BOOT, SCM_CMD_TZ_PSHOLD, NULL, 0, NULL, 0);
if (ret != 0)
writel(0, GCNT_PSHOLD);
}
void reset_cpu(unsigned long a)
{
reset_crashdump();
if (is_scm_armv8()) {
psci_sys_reset();
} else {
qti_scm_pshold();
}
while(1);
}

6
include/configs/ipq6018.h
View file

@ -295,4 +295,10 @@ extern loff_t board_env_size;
* By default we are disabling it */
/*#define CONFIG_IPQ_REPORT_L2ERR*/
/*
* Other commands
*/
#define CONFIG_ARMV7_PSCI
#endif /* _IPQ6018_H */