Nord: HPASS ADSP0/1/2 cluster support (+ RRD USB_1 enablement)

Documentation/devicetree/bindings/remoteproc/qcom,nord-pas.yaml

@@ -17,6 +17,8 @@ properties:
   compatible:
     enum:
       - qcom,nord-adsp-pas
+      - qcom,nord-adsp1-pas
+      - qcom,nord-adsp2-pas
       - qcom,nord-cdsp0-pas
       - qcom,nord-cdsp1-pas
       - qcom,nord-cdsp2-pas
@@ -89,6 +91,19 @@ properties:
     maxItems: 1
     description: The names of the state bits used for SMP2P output
 
+  qcom,cluster-root:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description:
+      Reference to the Peripheral Authentication Service instance that owns the
+      resources shared across this DSP's cluster. HPASS shares clock/reset/NoC
+      resources between its ADSP0/1/2 QDSP6 instances, and the owning instance
+      (ADSP0) has to boot first to initialize them before ADSP1/ADSP2 can cold
+      boot. Every member of a cluster carries this property, the owning instance
+      included, which references itself; instances whose property references the
+      same node form one cluster. A cluster is always brought down as a single
+      unit; any member crashing or being stopped forces every other member to
+      crash or stop with it.
+
 required:
   - compatible
   - reg
@@ -101,6 +116,8 @@ allOf:
         compatible:
           enum:
             - qcom,nord-adsp-pas
+            - qcom,nord-adsp1-pas
+            - qcom,nord-adsp2-pas
     then:
       properties:
         power-domains:

arch/arm64/boot/dts/qcom/nord-embedded.dtsi

@@ -577,6 +577,28 @@
 			     "mx";
 };
 
+&remoteproc_adsp1 {
+	clocks = <&rpmhcc RPMH_CXO_CLK>;
+	clock-names = "xo";
+	interconnects = <&hpass_ag_noc MASTER_HPASS_PROC_1 QCOM_ICC_TAG_ALWAYS
+			 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+	power-domains = <&rpmhpd RPMHPD_CX>,
+			<&rpmhpd RPMHPD_MX>;
+	power-domain-names = "cx",
+			     "mx";
+};
+
+&remoteproc_adsp2 {
+	clocks = <&rpmhcc RPMH_CXO_CLK>;
+	clock-names = "xo";
+	interconnects = <&hpass_ag_noc MASTER_HPASS_PROC_2 QCOM_ICC_TAG_ALWAYS
+			 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+	power-domains = <&rpmhpd RPMHPD_CX>,
+			<&rpmhpd RPMHPD_MX>;
+	power-domain-names = "cx",
+			     "mx";
+};
+
 &remoteproc_cdsp0 {
 	clocks = <&rpmhcc RPMH_CXO_CLK>;
 	clock-names = "xo";

arch/arm64/boot/dts/qcom/nord-ride-sx.dts

@@ -594,6 +594,20 @@
 	status = "okay";
 };
 
+&remoteproc_adsp1 {
+	firmware-name = "qcom/nord/adsp1.mbn",
+			"qcom/nord/adsp1_dtbs.elf";
+
+	status = "okay";
+};
+
+&remoteproc_adsp2 {
+	firmware-name = "qcom/nord/adsp2.mbn",
+			"qcom/nord/adsp2_dtbs.elf";
+
+	status = "okay";
+};
+
 &remoteproc_cdsp0 {
 	firmware-name = "qcom/nord/cdsp.mbn",
 			"qcom/nord/cdsp_dtbs.elf";

arch/arm64/boot/dts/qcom/nord-rrd.dts

@@ -59,6 +59,14 @@
 		regulator-max-microvolt = <3300000>;
 		regulator-always-on;
 	};
+
+	vreg_hub_1p2: regulator-hub-1p2 {
+		compatible = "regulator-fixed";
+		regulator-name = "vreg_hub_1p2";
+		regulator-min-microvolt = <1200000>;
+		regulator-max-microvolt = <1200000>;
+		regulator-always-on;
+	};
 };
 
 &apps_rsc {
@@ -519,6 +527,14 @@
 		vdd1v8-supply = <&vreg_l3l_1p8>;
 		vdd3v3-supply = <&vreg_pre_reg_3p3>;
 	};
+
+	eusb2_redriver_usb1: redriver@4f {
+		compatible = "nxp,ptn3222";
+		reg = <0x4f>;
+		#phy-cells = <0>;
+		vdd1v8-supply = <&vreg_l3l_1p8>;
+		vdd3v3-supply = <&vreg_pre_reg_3p3>;
+	};
 };
 
 &qupv3_0 {
@@ -546,6 +562,20 @@
 	status = "okay";
 };
 
+&remoteproc_adsp1 {
+	firmware-name = "qcom/nord/adsp1.mbn",
+			"qcom/nord/adsp1_dtbs.elf";
+
+	status = "okay";
+};
+
+&remoteproc_adsp2 {
+	firmware-name = "qcom/nord/adsp2.mbn",
+			"qcom/nord/adsp2_dtbs.elf";
+
+	status = "okay";
+};
+
 &remoteproc_cdsp0 {
 	firmware-name = "qcom/nord/cdsp.mbn",
 			"qcom/nord/cdsp_dtbs.elf";
@@ -626,3 +656,44 @@
 
 	status = "okay";
 };
+
+&usb_1 {
+	dr_mode = "host";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	status = "okay";
+
+	hub_hs: hub@1 {
+		compatible = "usb5e3,610";
+		reg = <1>;
+		reset-gpios = <&tlmm 170 GPIO_ACTIVE_LOW>;
+		vdd-supply = <&vreg_pre_reg_3p3>;
+		peer-hub = <&hub_ss>;
+	};
+
+	hub_ss: hub@2 {
+		compatible = "usb5e3,625";
+		reg = <2>;
+		vdd-supply = <&vreg_pre_reg_3p3>;
+		vdd12-supply = <&vreg_hub_1p2>;
+		peer-hub = <&hub_hs>;
+	};
+};
+
+&usb_1_hsphy {
+	vdd-supply = <&vreg_l1e_0p9>;
+	vdda12-supply = <&vreg_l2i_1p2>;
+
+	phys = <&eusb2_redriver_usb1>;
+
+	status = "okay";
+};
+
+&usb_1_qmpphy {
+	vdda-phy-supply = <&vreg_l1h_0p9>;
+	vdda-pll-supply = <&vreg_l2h_1p2>;
+
+	status = "okay";
+};