commit f8e59efd09ba69b0cb98b8cb7f4214de15b95b45
author Linux Build Service Account <lnxbuild@localhost> Fri Sep 20 17:11:57 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 20 17:11:57 2019 -0700
tree 61e7ad889463262f0c3d8e6b64ebecd1810c4e53
parent becd07ff6b299983241234f2652e93dc911d7cdb
parent 7bec79fb7c33027c8a5401e1b526164d10db976b

Merge "ipq: bootm: do pcie and usb deinit in bootm path"

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