commit becd07ff6b299983241234f2652e93dc911d7cdb
author Linux Build Service Account <lnxbuild@localhost> Thu Sep 19 09:13:29 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 19 09:13:29 2019 -0700
tree ce6b03f9641108158d8984e825e8f16c073aed3f
parent 0a17e06f1e6218410cb2bfab47f5eabbac59a0bc
parent dcfb86f9d9f7e0d0d6014d9799395f1f55f9a401

Merge "reset: Use correct scm id for pshold"

include/configs/ipq6018.h

diff --git a/include/configs/ipq6018.h b/include/configs/ipq6018.h
index 52d1c6e..23a4734 100644
--- a/include/configs/ipq6018.h
+++ b/include/configs/ipq6018.h
@@ -296,7 +296,7 @@
 #define CLEAR_MAGIC				0x0
 #define SCM_CMD_TZ_CONFIG_HW_FOR_RAM_DUMP_ID	0x9
 #define SCM_CMD_TZ_FORCE_DLOAD_ID		0x10
-#define SCM_CMD_TZ_PSHOLD			0x15
+#define SCM_CMD_TZ_PSHOLD			0x16
 #define BOOT_VERSION				0
 #define TZ_VERSION				1
 #define RPM_VERSION				3

include/configs/ipq807x.h

diff --git a/include/configs/ipq807x.h b/include/configs/ipq807x.h
index 819e67a..b7d8bf3 100644
--- a/include/configs/ipq807x.h
+++ b/include/configs/ipq807x.h
@@ -262,7 +262,7 @@
 #define CLEAR_MAGIC				0x0
 #define SCM_CMD_TZ_CONFIG_HW_FOR_RAM_DUMP_ID	0x9
 #define SCM_CMD_TZ_FORCE_DLOAD_ID		0x10
-#define SCM_CMD_TZ_PSHOLD			0x15
+#define SCM_CMD_TZ_PSHOLD			0x16
 #define BOOT_VERSION				0
 #define TZ_VERSION				1
 #define RPM_VERSION				3