aboutsummaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2017-09-08 03:50:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-08 03:50:21 +0000
commitb52ceb2c86de78504cadaf718a0b0faef1875b7e (patch)
tree1c743b0eef46e536bb5e9d2066e85f3341c6cc27 /plat
parentf55c77f0a91142f89e9463d4f28d4932228e6a51 (diff)
parentc3a21abd5624f1d9bce9f3b009c0af408a0c22ec (diff)
downloadarm-trusted-firmware-b52ceb2c86de78504cadaf718a0b0faef1875b7e.tar.gz
Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: 179eae6bcb am: 8fa3096942 am: c8a63591de
am: c3a21abd56 Change-Id: Ic3acf18e0fb3dc396235519b403c7d15956bc3fa
Diffstat (limited to 'plat')
-rw-r--r--plat/hikey/drivers/hisi_pwrc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/plat/hikey/drivers/hisi_pwrc.c b/plat/hikey/drivers/hisi_pwrc.c
index 9f189da7..c1d9e471 100644
--- a/plat/hikey/drivers/hisi_pwrc.c
+++ b/plat/hikey/drivers/hisi_pwrc.c
@@ -98,7 +98,13 @@ int hisi_pwrc_setup(void)
pm_asm_code_end - pm_asm_code);
reg = mmio_read_32(0xF7800000 + 0x004);
+
+ /* Remap SRAM address */
reg |= BIT(0x1) | BIT(17);
+
+ /* Enable reset signal for watchdog */
+ reg |= BIT(0x0) | BIT(16);
+
mmio_write_32(0xF7800000 + 0x004, reg);
return 0;