drivers:usb:common:fsl-dt-fixup: Add device-tree fixup support for xhci controller

Enables usb device-tree fixup code to incorporate xhci controller

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@nxp.com>
Signed-off-by: Sriram Dash <sriram.dash@nxp.com>

diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile
index a38ee4a433cf35db8c6278035f78e35ac085e7e2..2f3d43d9395c3f2b2c546eadb6cab4c91f659163 100644 (file)
--- a/drivers/usb/common/Makefile
+++ b/drivers/usb/common/Makefile
@@ -4,3 +4,4 @@
 #
 
 obj-$(CONFIG_USB_EHCI_FSL) += fsl-dt-fixup.o
+obj-$(CONFIG_USB_XHCI_FSL) += fsl-dt-fixup.o

diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index eb13f12c23380e9a89e6d7e1107cd362195b311f..46488dcdcdf54b064763e05fd090f9d0e201110c 100644 (file)
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -19,27 +19,27 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
 #endif
 
+static const char * const compat_usb_fsl[] = {
+       "fsl-usb2-mph",
+       "fsl-usb2-dr",
+       "snps,dwc3",
+       NULL
+};
+
 static const char *fdt_usb_get_node_type(void *blob, int start_offset,
                                         int *node_offset)
 {
-       const char *compat_dr = "fsl-usb2-dr";
-       const char *compat_mph = "fsl-usb2-mph";
        const char *node_type = NULL;
-
-       *node_offset = fdt_node_offset_by_compatible(blob, start_offset,
-                                                    compat_mph);
-       if (*node_offset < 0) {
-               *node_offset = fdt_node_offset_by_compatible(blob,
-                                                            start_offset,
-                                                            compat_dr);
-               if (*node_offset < 0) {
-                       printf("ERROR: could not find compatible node: %s\n",
-                              fdt_strerror(*node_offset));
-               } else {
-                       node_type = compat_dr;
+       int i;
+
+       for (i = 0; compat_usb_fsl[i]; i++) {
+               *node_offset = fdt_node_offset_by_compatible
+                                       (blob, start_offset,
+                                        compat_usb_fsl[i]);
+               if (*node_offset >= 0) {
+                       node_type = compat_usb_fsl[i];
+                       break;
                }
-       } else {
-               node_type = compat_mph;
        }
 
        return node_type;

diff --git a/include/fdt_support.h b/include/fdt_support.h
index 296add01f34f9ece7f172b4a59c3cff9eb63d474..d34e959ca7886ac672b2ffd347c75c2fab33606d 100644 (file)
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -113,11 +113,11 @@ void fdt_fixup_qe_firmware(void *fdt);
  */
 int fdt_fixup_display(void *blob, const char *path, const char *display);
 
-#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
+#if defined(CONFIG_USB_EHCI_FSL) || defined(CONFIG_USB_XHCI_FSL)
 void fdt_fixup_dr_usb(void *blob, bd_t *bd);
 #else
 static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {}
-#endif /* defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) */
+#endif /* defined(CONFIG_USB_EHCI_FSL) || defined(CONFIG_USB_XHCI_FSL) */
 
 #if defined(CONFIG_SYS_FSL_SEC_COMPAT)
 void fdt_fixup_crypto_node(void *blob, int sec_rev);