Merge "ARM: dts: msm: Enable new download/restart mode drivers for Lahaina"

bindings/power/reset/qcom,dload-mode.yaml

@@ -0,0 +1,27 @@
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/soc/qcom/qcom,dload-mode.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm Technologies, Inc. Download Mode binding
+
+maintainers:
+  - Elliot Berman <eberman@quicinc.com>
+
+description: |
+  The Download Mode driver is used to manage sending SoC into a dump collection
+  mode after a reboot.
+
+properties:
+  compatible:
+    items:
+      - const: qcom,dload-mode
+
+required:
+  - compatible
+
+examples:
+  - |
+    qcom,dload-mode {
+        compatible = "qcom,dload-mode";
+    };

bindings/power/reset/qcom,reboot-reason.yaml

@@ -0,0 +1,44 @@
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/power/reset/qcom-reboot-reason.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm Technologies, Inc. reboot reason binding
+
+maintainers:
+  - Elliot Berman <eberman@quicinc.com>
+
+description: |
+  Qualcomm Technologies, Inc. SoCs support booting to special download
+  modes after a restart. These modes could be a normal restart,
+  restarting into a ramdump collection mode (CrashDump), or restarting
+  into "emergency download mode".
+
+properties:
+  compatible:
+    items:
+      - const: qcom,reboot-mode
+
+  allOf:
+    - $ref: /schemas/nvmem/nvmem-consumer.yaml#/properties
+    - items:
+      nvmem-cell-names:
+        items:
+          - const: restart_reason
+
+required:
+  - compatible
+  - nvmem-cells-names
+
+dependencies:
+  allOf:
+    - $ref: /schemas/nvmem/nvmem-consumer.yaml#/dependencies
+
+
+examples:
+  - |
+    reboot-reason {
+      compatible = "qcom,reboot-reason";
+      nvmem-cells = <&restart_reason>;
+      nvmem-cell-names = "restart_reason";
+    };

qcom/lahaina-pmic-overlay.dtsi

@@ -547,7 +547,10 @@
 	};
 };
 
-&restart {
-	nvmem-cells = <&restart_reason>;
-	nvmem-cell-names = "restart_reason";
+&soc {
+	reboot_reason {
+		compatible = "qcom,reboot-reason";
+		nvmem-cells = <&restart_reason>;
+		nvmem-cell-names = "restart_reason";
+	};
 };

qcom/lahaina.dtsi

@@ -266,6 +266,7 @@
 	firmware: firmware {
 		scm {
 			compatible = "qcom,scm";
+			qcom,dload-mode = <&tcsr 0x13000>;
 		};
 
 		android {
@@ -2077,10 +2078,8 @@
 		};
 	};
 
-	restart: restart@c264000 {
-		compatible = "qcom,pshold";
-		reg = <0xc264000 0x4>, <0x1fd3000 0x4>;
-		reg-names = "pshold-base", "tcsr-boot-misc-detect";
+	dload_mode {
+		compatible = "qcom,dload-mode";
 	};
 
 	tlmm: pinctrl@f000000 {
@@ -3220,6 +3219,11 @@
 		#hwlock-cells = <1>;
 	};
 
+	tcsr: syscon@1fc0000 {
+		compatible = "syscon";
+		reg = <0x1fc0000 0x30000>;
+	};
+
 	smem: qcom,smem {
 		compatible = "qcom,smem";
 		memory-region = <&smem_mem>;