Update EUD series to v4

Documentation/ABI/testing/sysfs-driver-eud

@@ -17,9 +17,9 @@ Description:
 		USB ports.
 
 		Valid values:
-		  0 - Primary USB port
-		  1 - Secondary USB port
+		  primary   - Primary USB port
+		  secondary - Secondary USB port
 
 		The attribute is writable only while EUD is disabled.
 		Reading the attribute returns the currently selected
-		USB port number.
+		USB port.

Documentation/devicetree/bindings/connector/usb-connector.yaml

@@ -95,14 +95,6 @@ properties:
       - device
       - dual
 
-  usb-role-switch:
-    $ref: /schemas/types.yaml#/definitions/phandle
-    description:
-      A phandle to the USB role-switch provider. The provider is typically
-      a dual-role (DRD) USB controller node that declares the boolean
-      'usb-role-switch' property. Use this when the connector is not
-      directly linked to the provider in the OF graph.
-
   typec-power-opmode:
     description: Determines the power operation mode that the Type C connector
       will support and will advertise through CC pins when it has no power

Documentation/devicetree/bindings/soc/qcom/qcom,eud.yaml

@@ -32,32 +32,76 @@ properties:
   ports:
     $ref: /schemas/graph.yaml#/properties/ports
     description:
-      These ports attach to endpoints of DWC3 controller nodes and Type-C
-      connector nodes. The controller has the "usb-role-switch" property.
-      EUD supports up to 2 USB ports. For single-port configurations, use
-      port@0 and port@1. For dual-port configurations, use all four ports.
+      These ports is to be attached to the endpoint of the DWC3 controller node
+      and type C connector node. The controller has the "usb-role-switch"
+      property.
 
     properties:
       port@0:
         $ref: /schemas/graph.yaml#/properties/port
-        description: This port is to be attached to the primary DWC3 controller.
+        description: This port is to be attached to the DWC3 controller.
 
       port@1:
         $ref: /schemas/graph.yaml#/properties/port
-        description: This port is to be attached to the primary Type-C connector.
+        description: This port is to be attached to the type C connector.
 
-      port@2:
-        $ref: /schemas/graph.yaml#/properties/port
-        description: This port is to be attached to the secondary DWC3 controller.
+  '#address-cells':
+    const: 1
 
-      port@3:
-        $ref: /schemas/graph.yaml#/properties/port
-        description: This port is to be attached to the secondary Type-C connector.
+  '#size-cells':
+    const: 0
+
+patternProperties:
+  "^eud-path@[0-1]$":
+    type: object
+    description:
+      Represents one High-Speed UTMI path that EUD intercepts. Use eud-path nodes
+      to associate role-switching behavior with specific port connections, allowing
+      EUD to manage role transitions independently for each UTMI path.
+
+    properties:
+      reg:
+        maxItems: 1
+        description: Path number
+
+      usb-role-switch:
+        type: boolean
+        description:
+          Indicates that EUD should act as a role switch for this path.
+          In device role, debug mode inserts the EUD hub into the UTMI path. In
+          host role, the EUD hub is bypassed and UTMI traffic flows directly
+          between the PHY and the USB controller.
+
+      ports:
+        $ref: /schemas/graph.yaml#/properties/ports
+        description:
+          These ports are to be attached to the endpoint of the USB controller node
+          and USB connector node.
+
+        properties:
+          port@0:
+            $ref: /schemas/graph.yaml#/properties/port
+            description: This port is to be attached to the USB controller.
+
+          port@1:
+            $ref: /schemas/graph.yaml#/properties/port
+            description: This port is to be attached to the USB connector.
+
+    required:
+      - reg
+      - ports
+
+    additionalProperties: false
 
 required:
   - compatible
   - reg
-  - ports
+
+oneOf:
+  - required:
+      - ports
+  - required:
+      - eud-path@0
 
 additionalProperties: false
 

arch/arm64/boot/dts/qcom/kodiak.dtsi

@@ -4617,22 +4617,28 @@
 			      <0 0x88e2000 0 0x1000>;
 			interrupts-extended = <&pdc 11 IRQ_TYPE_LEVEL_HIGH>;
 
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
 
-				port@0 {
-					reg = <0>;
+			eud0: eud-path@0 {
+				reg = <0>;
+				usb-role-switch;
 
-					eud_ep: endpoint {
-						remote-endpoint = <&usb_1_dwc3_hs>;
-					};
-				};
+				ports {
+					#address-cells = <1>;
+					#size-cells = <0>;
 
-				port@1 {
-					reg = <1>;
+					port@0 {
+						reg = <0>;
+						eud_usb: endpoint {
+							remote-endpoint = <&usb_1_dwc3_hs>;
+						};
+					};
 
-					eud_con: endpoint {
+					port@1 {
+						reg = <1>;
+						eud_con: endpoint {
+						};
 					};
 				};
 			};
@@ -4858,7 +4864,7 @@
 					reg = <0>;
 
 					usb_1_dwc3_hs: endpoint {
-						remote-endpoint = <&eud_ep>;
+						remote-endpoint = <&eud_usb>;
 					};
 				};
 

arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts

@@ -88,7 +88,6 @@
 			reg = <0>;
 			power-role = "dual";
 			data-role = "dual";
-			usb-role-switch = <&usb_1>;
 
 			ports {
 				#address-cells = <1>;

arch/arm64/boot/dts/qcom/qcm6490-particle-tachyon.dts

@@ -65,7 +65,6 @@
 			reg = <0>;
 			power-role = "dual";
 			data-role = "dual";
-			usb-role-switch = <&usb_1>;
 
 			ports {
 				#address-cells = <1>;

arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts

@@ -75,7 +75,6 @@
 			reg = <0>;
 			power-role = "dual";
 			data-role = "dual";
-			usb-role-switch = <&usb_1>;
 
 			ports {
 				#address-cells = <1>;

arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts

@@ -185,7 +185,6 @@
 			reg = <0>;
 			power-role = "dual";
 			data-role = "dual";
-			usb-role-switch = <&usb_1>;
 
 			ports {
 				#address-cells = <1>;

arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts

@@ -84,7 +84,6 @@
 			reg = <0>;
 			power-role = "dual";
 			data-role = "dual";
-			usb-role-switch = <&usb_1>;
 
 			ports {
 				#address-cells = <1>;

arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts

@@ -90,7 +90,6 @@
 			reg = <0>;
 			power-role = "dual";
 			data-role = "dual";
-			usb-role-switch = <&usb_1>;
 
 			ports {
 				#address-cells = <1>;

drivers/usb/dwc3/Kconfig

@@ -132,7 +132,6 @@ config USB_DWC3_QCOM
 	depends on ARCH_QCOM || COMPILE_TEST
 	depends on EXTCON || !EXTCON
 	depends on OF
-	depends on USB_QCOM_EUD || !USB_QCOM_EUD
 	default USB_DWC3
 	help
 	  Some Qualcomm SoCs use DesignWare Core IP for USB2/3

drivers/usb/dwc3/dwc3-qcom.c

@@ -9,7 +9,6 @@
 #include <linux/clk.h>
 #include <linux/irq.h>
 #include <linux/of_clk.h>
-#include <linux/of_graph.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/interconnect.h>
@@ -20,7 +19,6 @@
 #include <linux/iopoll.h>
 #include <linux/usb/hcd.h>
 #include <linux/usb.h>
-#include <linux/usb/qcom_eud.h>
 #include "core.h"
 #include "glue.h"
 
@@ -563,7 +561,6 @@ static int dwc3_qcom_setup_irq(struct dwc3_qcom *qcom, struct platform_device *p
 static void dwc3_qcom_set_role_notifier(struct dwc3 *dwc, enum usb_role next_role)
 {
 	struct dwc3_qcom *qcom = to_dwc3_qcom(dwc);
-	struct device_node *eud_node;
 
 	if (qcom->current_role == next_role)
 		return;
@@ -573,13 +570,6 @@ static void dwc3_qcom_set_role_notifier(struct dwc3 *dwc, enum usb_role next_rol
 		return;
 	}
 
-	/* Notify EUD of role change */
-	eud_node = of_graph_get_remote_node(qcom->dev->of_node, 0, -1);
-	if (eud_node) {
-		qcom_eud_usb_role_notify(eud_node, dwc->usb2_generic_phy[0], next_role);
-		of_node_put(eud_node);
-	}
-
 	if (qcom->current_role == USB_ROLE_DEVICE)
 		dwc3_qcom_vbus_override_enable(qcom, false);
 	else if (qcom->current_role != USB_ROLE_DEVICE)

drivers/usb/misc/Kconfig

@@ -147,7 +147,6 @@ config USB_APPLEDISPLAY
 config USB_QCOM_EUD
 	tristate "QCOM Embedded USB Debugger(EUD) Driver"
 	depends on ARCH_QCOM || COMPILE_TEST
-	depends on OF
 	select QCOM_SCM
 	select USB_ROLE_SWITCH
 	help