Re: [U-Boot] [PATCH v6 3/4] drivers:usb:common:fsl-dt-fixup: Add device-tree fixup support for xhci controller

On 04/05/2016 11:11 AM, Sriram Dash wrote:

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

---

Changes in v6:

• static const char * const array

This changelog entry is completely useless, it tells me exactly nothing about what you changed.

Changes in v5:

• Make the array static const

Changes in v4:

• Use a terminating entry in the array for getting node type for controller

Changes in v3:

• Modify the Makefile to remove comparison
• Put the supported controllers in array and checking from array

Changes in v2:

• Remove the #defines from the patch and adding controller support

drivers/usb/common/Makefile | 1 + drivers/usb/common/fsl-dt-fixup.c | 32 ++++++++++++++++---------------- include/fdt_support.h | 4 ++-- 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile index a38ee4a..2f3d43d 100644 --- 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 eb13f12..46488dc 100644 --- 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 296add0..d34e959 100644 --- 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);