usb: xhci-dwc3: Support role switch default role

When the device tree indicates support for role switching through
the "usb-role-switch" property, take the "role-switch-default-mode"
property into account when deciding which role to put the
controller into.

This makes USB devices work on Apple M1 systems where the device
tree may include a "dr_mode" property that is set to "otg", but
where we need to put the controller into "host" mode to see
devices connected to the type-C ports.

Signed-off-by: Mark Kettenis <kettenis@openbsd.org>

diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index ee0c064f1ffb9fbb4ad76a08105d2da3838c1619..cff86a51ae0057a28822e2c6270fa081afab78ce 100644 (file)
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -40,6 +40,22 @@ enum usb_dr_mode usb_get_dr_mode(ofnode node)
        return USB_DR_MODE_UNKNOWN;
 }
 
+enum usb_dr_mode usb_get_role_switch_default_mode(ofnode node)
+{
+       const char *dr_mode;
+       int i;
+
+       dr_mode = ofnode_read_string(node, "role-switch-default-mode");
+       if (!dr_mode)
+               return USB_DR_MODE_UNKNOWN;
+
+       for (i = 0; i < ARRAY_SIZE(usb_dr_modes); i++)
+               if (!strcmp(dr_mode, usb_dr_modes[i]))
+                       return i;
+
+       return USB_DR_MODE_UNKNOWN;
+}
+
 static const char *const speed_names[] = {
        [USB_SPEED_UNKNOWN] = "UNKNOWN",
        [USB_SPEED_LOW] = "low-speed",

diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index bec0d980811061f4d0e565f864e2ff9e21474022..1dbd65dfaa34e5f1d5a31728b66d80c1a3e6ac5c 100644 (file)
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -209,6 +209,12 @@ static int xhci_dwc3_probe(struct udevice *dev)
        writel(reg, &dwc3_reg->g_usb2phycfg[0]);
 
        dr_mode = usb_get_dr_mode(dev_ofnode(dev));
+       if (dr_mode == USB_DR_MODE_OTG &&
+           dev_read_bool(dev, "usb-role-switch")) {
+               dr_mode = usb_get_role_switch_default_mode(dev_ofnode(dev));
+               if (dr_mode == USB_DR_MODE_UNKNOWN)
+                       dr_mode = USB_DR_MODE_OTG;
+       }
        if (dr_mode == USB_DR_MODE_UNKNOWN)
                /* by default set dual role mode to HOST */
                dr_mode = USB_DR_MODE_HOST;

diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index c19b916be9d4b48ac66a6e93f66663fc409318f8..5d0dac950efe6cd252f49d48294e6fdaa702607f 100644 (file)
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -27,6 +27,16 @@ enum usb_dr_mode {
  */
 enum usb_dr_mode usb_get_dr_mode(ofnode node);
 
+/**
+ * usb_get_dr_mode() - Get dual role mode for given device
+ * @node: ofnode of the given device
+ *
+ * The function gets phy interface string from property
+ * 'role-switch-defaulr-mode', and returns the correspondig enum
+ * usb_dr_mode
+ */
+enum usb_dr_mode usb_get_role_switch_default_mode(ofnode node);
+
 /**
  * usb_get_maximum_speed() - Get maximum speed for given device
  * @node: ofnode of the given device