Merge "ipq40xx: Support cpu reset" into eggplant

This commit is contained in:
Linux Build Service Account 2016-10-03 06:30:48 -07:00 committed by Gerrit - the friendly Code Review server
commit b893fade6f

View file

@ -23,6 +23,7 @@
#include <asm/arch-qcom-common/scm.h>
#include <asm/arch-qcom-common/qpic_nand.h>
#include <asm/arch-qcom-common/gpio.h>
#include <asm/arch-qcom-common/iomap.h>
#include <jffs2/load_kernel.h>
#include <fdtdec.h>
#include <asm/arch-qcom-common/uart.h>
@ -77,10 +78,6 @@ void qca_serial_init(struct ipq_serial_platdata *plat)
qca_gpio_init(node);
}
void reset_cpu(ulong addr)
{
}
void reset_crashdump(void)
{
unsigned int magic_cookie = CLEAR_MAGIC;
@ -92,6 +89,15 @@ void reset_crashdump(void)
sizeof(magic_cookie), NULL, 0);
}
void reset_cpu(ulong addr)
{
/* Clear Debug sw entry register */
reset_crashdump();
/* clear ps-hold bit to reset the soc */
writel(0, GCNT_PSHOLD);
while (1);
}
void board_nand_init(void)
{
struct qpic_nand_init_config config;