Merge "ipq6018: fdt_fixup: Added rproc auto-restart support"
diff --git a/board/qca/arm/ipq6018/ipq6018.c b/board/qca/arm/ipq6018/ipq6018.c
index 3bb85c0..62a14bc 100644
--- a/board/qca/arm/ipq6018/ipq6018.c
+++ b/board/qca/arm/ipq6018/ipq6018.c
@@ -1201,6 +1201,28 @@
 
 void fdt_fixup_auto_restart(void *blob)
 {
+	int nodeoff, ret;
+	const char *node = "/soc/q6v5_wcss@CD00000";
+	const char *paniconwcssfatal;
+
+	paniconwcssfatal = getenv("paniconwcssfatal");
+
+	if (!paniconwcssfatal)
+		return;
+
+	if (strncmp(paniconwcssfatal, "1", sizeof("1"))) {
+		printf("fixup_auto_restart: invalid variable 'paniconwcssfatal'");
+	} else {
+		nodeoff = fdt_path_offset(blob, node);
+		if (nodeoff < 0) {
+			printf("fixup_auto_restart: unable to find node '%s'\n", node);
+			return;
+		}
+		ret = fdt_delprop(blob, nodeoff, "qca,auto-restart");
+
+		if (ret)
+			printf("fixup_auto_restart: cannot delete property");
+	}
 	return;
 }