Merge "ARM: dts: qcom: add Glink SPMI debug controller device for Lahaina"

bindings/spmi/qcom,spmi-glink-debug.txt

@@ -0,0 +1,52 @@
+Qualcomm Technologies, Inc. Glink SPMI Debug Controller
+
+The Qualcomm Technologies, Inc. Glink SPMI debug controller device provides an
+interface to read and write PMIC registers over PMIC Glink using a remote
+subsytem (e.g. DSP).  This allows for debugging PMIC peripherals that would
+typically only be accessible to the charger and fuel gauging firmware running
+on the remote subsystem.
+
+Refer to Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.txt for
+information on "qcom,pmic_glink_log" device which is used in the example below.
+
+See spmi.txt for the generic SPMI controller binding requirements for grandchild
+nodes.
+
+Required device node structure:
+
+The Glink SPMI debug controller node must contain at least one child node.  Each
+child node corresponds to an SPMI bus accessible from the remote subsystem.
+
+Top Level Node Supported Properties:
+
+- compatible:
+	Usage:      required
+	Value type: <stringlist>
+	Definition: Must be "qcom,spmi-glink-debug".
+
+Child Node Supported Properties:
+
+- reg
+	Usage:      required
+	Value type: <u32>
+	Definition: Bus ID of this SPMI bus.
+
+Example:
+
+&soc {
+	qcom,pmic_glink_log {
+		qcom,spmi_glink_debug {
+			compatible = "qcom,spmi-glink-debug";
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			spmi@0 {
+				reg = <0>;
+			};
+
+			spmi@1 {
+				reg = <1>;
+			};
+		};
+	};
+};

qcom/lahaina-cdp.dtsi

@@ -9,6 +9,10 @@
 	status = "ok"
 };
 
+&spmi_glink_debug {
+	status = "ok"
+};
+
 &soc {
 	gpio_keys {
 		compatible = "gpio-keys";

qcom/lahaina-mtp.dtsi

@@ -9,6 +9,10 @@
 	status = "ok"
 };
 
+&spmi_glink_debug {
+	status = "ok"
+};
+
 &soc {
 	gpio_keys {
 		compatible = "gpio-keys";

qcom/lahaina-qrd-common.dtsi

@@ -7,6 +7,14 @@
 	status = "ok"
 };
 
+&spmi_glink_debug {
+	status = "ok"
+};
+
+&smb1398_debug {
+	status = "ok"
+};
+
 &soc {
 	gpio_keys {
 		compatible = "gpio-keys";

qcom/lahaina.dtsi

@@ -3677,6 +3677,52 @@
 		qcom,battery_debug {
 			compatible = "qcom,battery-debug";
 		};
+
+		spmi_glink_debug: qcom,spmi_glink_debug {
+			compatible = "qcom,spmi-glink-debug";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+
+			/* Primary SPMI bus */
+			spmi@0 {
+				reg = <0>;
+				#address-cells = <2>;
+				#size-cells = <0>;
+
+				qcom,pm8350b-debug@3 {
+					compatible = "qcom,spmi-pmic";
+					reg = <0x3 SPMI_USID>;
+					qcom,can-sleep;
+				};
+			};
+
+			/* Secondary (QUP) SPMI bus */
+			spmi@1 {
+				reg = <1>;
+				#address-cells = <2>;
+				#size-cells = <0>;
+
+				qcom,smb1396-debug@b {
+					compatible = "qcom,spmi-pmic";
+					reg = <0xb SPMI_USID>;
+					qcom,can-sleep;
+				};
+
+				qcom,smb1396-debug@c {
+					compatible = "qcom,spmi-pmic";
+					reg = <0xc SPMI_USID>;
+					qcom,can-sleep;
+				};
+
+				smb1398_debug: qcom,smb1398-debug@d {
+					compatible = "qcom,spmi-pmic";
+					reg = <0xd SPMI_USID>;
+					qcom,can-sleep;
+					status = "disabled";
+				};
+			};
+		};
 	};
 
 	bluetooth: bt_qca6490 {