diff mbox

[U-Boot,2/3,v2] drivers: usb: Make usb device-tree fixup code architecture independent

Message ID 1413804049-7510-1-git-send-email-nikhil.badola@freescale.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Nikhil Badola Oct. 20, 2014, 11:20 a.m. UTC 
move usb device tree fixup code from "arch/powerpc/" to "drivers/usb/"
so that it works independent of architecture it is running on

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
---
Changes for v2 :
	- Fixed compilation error for Platforms with 
	  CONFIG_USB_MAX_CONTROLLER_COUNT not defined
	- Depends on https://patchwork.ozlabs.org/patch/401063/ 

 arch/powerpc/cpu/mpc8xxx/fdt.c | 104 -------------------------------------
 drivers/usb/host/ehci-fsl.c    | 113 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 104 deletions(-)

Comments

York Sun Nov. 14, 2014, 6:57 p.m. UTC | #1 
On 10/20/2014 04:20 AM, Nikhil Badola wrote:
> move usb device tree fixup code from "arch/powerpc/" to "drivers/usb/"
> so that it works independent of architecture it is running on
> 
> Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
> Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
> ---
> Changes for v2 :
> 	- Fixed compilation error for Platforms with 
> 	  CONFIG_USB_MAX_CONTROLLER_COUNT not defined
> 	- Depends on https://patchwork.ozlabs.org/patch/401063/ 
> 
>  arch/powerpc/cpu/mpc8xxx/fdt.c | 104 -------------------------------------
>  drivers/usb/host/ehci-fsl.c    | 113 +++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 113 insertions(+), 104 deletions(-)
> 

We have compiling error for boards MPC837XEMDS_HOST MPC837XERDB. ehci-fsl.c is
not compiled for these boards. Can you check if CONFIG_USB_EHCI_FSL can be
defined for them.

Adding Kim.

York
York Sun Nov. 25, 2014, 9:35 p.m. UTC | #2 
On 11/14/2014 10:57 AM, York Sun wrote:
> On 10/20/2014 04:20 AM, Nikhil Badola wrote:
>> move usb device tree fixup code from "arch/powerpc/" to "drivers/usb/"
>> so that it works independent of architecture it is running on
>>
>> Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
>> Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
>> ---
>> Changes for v2 :
>> 	- Fixed compilation error for Platforms with 
>> 	  CONFIG_USB_MAX_CONTROLLER_COUNT not defined
>> 	- Depends on https://patchwork.ozlabs.org/patch/401063/ 
>>
>>  arch/powerpc/cpu/mpc8xxx/fdt.c | 104 -------------------------------------
>>  drivers/usb/host/ehci-fsl.c    | 113 +++++++++++++++++++++++++++++++++++++++++
>>  2 files changed, 113 insertions(+), 104 deletions(-)
>>
> 
> We have compiling error for boards MPC837XEMDS_HOST MPC837XERDB. ehci-fsl.c is
> not compiled for these boards. Can you check if CONFIG_USB_EHCI_FSL can be
> defined for them.
> 
> Adding Kim.
> 

Nikhil,

Please address this ASAP. It blocks other patches.

York
Nikhil Badola Nov. 26, 2014, 3:14 a.m. UTC | #3 
> -----Original Message-----
> From: York Sun [mailto:yorksun@freescale.com]
> Sent: Wednesday, November 26, 2014 3:05 AM
> To: Badola Nikhil-B46172
> Cc: u-boot@lists.denx.de; Phillips Kim-R1AAHA; Mehresh Ramneek-B31383
> Subject: Re: [U-Boot] [PATCH 2/3][v2] drivers: usb: Make usb device-tree
> fixup code architecture independent
> 
> On 11/14/2014 10:57 AM, York Sun wrote:
> > On 10/20/2014 04:20 AM, Nikhil Badola wrote:
> >> move usb device tree fixup code from "arch/powerpc/" to "drivers/usb/"
> >> so that it works independent of architecture it is running on
> >>
> >> Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
> >> Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
> >> ---
> >> Changes for v2 :
> >> 	- Fixed compilation error for Platforms with
> >> 	  CONFIG_USB_MAX_CONTROLLER_COUNT not defined
> >> 	- Depends on https://patchwork.ozlabs.org/patch/401063/
> >>
> >>  arch/powerpc/cpu/mpc8xxx/fdt.c | 104 -------------------------------------
> >>  drivers/usb/host/ehci-fsl.c    | 113
> +++++++++++++++++++++++++++++++++++++++++
> >>  2 files changed, 113 insertions(+), 104 deletions(-)
> >>
> >
> > We have compiling error for boards MPC837XEMDS_HOST MPC837XERDB.
> > ehci-fsl.c is not compiled for these boards. Can you check if
> > CONFIG_USB_EHCI_FSL can be defined for them.
> >
> > Adding Kim.
> >
> 
> Nikhil,
> 
> Please address this ASAP. It blocks other patches.

This compilation error has been addressed by patch https://patchwork.ozlabs.org/patch/401063/ 
which is awaiting upstream.
York Sun Dec. 11, 2014, 7:06 p.m. UTC | #4 
On 10/20/2014 04:20 AM, Nikhil Badola wrote:
> move usb device tree fixup code from "arch/powerpc/" to "drivers/usb/"
> so that it works independent of architecture it is running on
> 
> Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
> Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
> ---
> Changes for v2 :
> 	- Fixed compilation error for Platforms with 
> 	  CONFIG_USB_MAX_CONTROLLER_COUNT not defined
> 	- Depends on https://patchwork.ozlabs.org/patch/401063/ 


Applied to u-boot-fsl-qoriq master, awaiting upstream.

York
diff mbox

Patch

diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index 4cec5e1..65fde3f 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -73,110 +73,6 @@  void ft_fixup_num_cores(void *blob) {
 }
 #endif /* defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) */
 
-#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
-static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
-				const char *phy_type, int start_offset)
-{
-	const char *compat_dr = "fsl-usb2-dr";
-	const char *compat_mph = "fsl-usb2-mph";
-	const char *prop_mode = "dr_mode";
-	const char *prop_type = "phy_type";
-	const char *node_type = NULL;
-	int node_offset;
-	int err;
-
-	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("WARNING: could not find compatible"
-				" node %s or %s: %s.\n", compat_mph,
-				compat_dr, fdt_strerror(node_offset));
-			return -1;
-		} else
-			node_type = compat_dr;
-	} else
-		node_type = compat_mph;
-
-	if (mode) {
-		err = fdt_setprop(blob, node_offset, prop_mode, mode,
-				  strlen(mode) + 1);
-		if (err < 0)
-			printf("WARNING: could not set %s for %s: %s.\n",
-			       prop_mode, node_type, fdt_strerror(err));
-	}
-
-	if (phy_type) {
-		err = fdt_setprop(blob, node_offset, prop_type, phy_type,
-				  strlen(phy_type) + 1);
-		if (err < 0)
-			printf("WARNING: could not set %s for %s: %s.\n",
-			       prop_type, node_type, fdt_strerror(err));
-	}
-
-	return node_offset;
-}
-
-void fdt_fixup_dr_usb(void *blob, bd_t *bd)
-{
-	const char *modes[] = { "host", "peripheral", "otg" };
-	const char *phys[] = { "ulpi", "utmi" };
-	int usb_mode_off = -1;
-	int usb_phy_off = -1;
-	char str[5];
-	int i, j;
-
-	for (i = 1; i <= CONFIG_USB_MAX_CONTROLLER_COUNT; i++) {
-		const char *dr_mode_type = NULL;
-		const char *dr_phy_type = NULL;
-		int mode_idx = -1, phy_idx = -1;
-		snprintf(str, 5, "%s%d", "usb", i);
-		if (hwconfig(str)) {
-			for (j = 0; j < ARRAY_SIZE(modes); j++) {
-				if (hwconfig_subarg_cmp(str, "dr_mode",
-						modes[j])) {
-					mode_idx = j;
-					break;
-				}
-			}
-
-			for (j = 0; j < ARRAY_SIZE(phys); j++) {
-				if (hwconfig_subarg_cmp(str, "phy_type",
-						phys[j])) {
-					phy_idx = j;
-					break;
-				}
-			}
-
-			if (mode_idx < 0 && phy_idx < 0) {
-				printf("WARNING: invalid phy or mode\n");
-				return;
-			}
-
-			if (mode_idx > -1)
-				dr_mode_type = modes[mode_idx];
-
-			if (phy_idx > -1)
-				dr_phy_type = phys[phy_idx];
-		}
-
-		usb_mode_off = fdt_fixup_usb_mode_phy_type(blob,
-			dr_mode_type, NULL, usb_mode_off);
-
-		if (usb_mode_off < 0)
-			return;
-
-		usb_phy_off = fdt_fixup_usb_mode_phy_type(blob,
-			NULL, dr_phy_type, usb_phy_off);
-
-		if (usb_phy_off < 0)
-			return;
-	}
-}
-#endif /* defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) */
-
 /*
  * update crypto node properties to a specified revision of the SEC
  * called with sec_rev == 0 if not on an E processor
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index d5361d7..906c67f 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -15,9 +15,14 @@ 
 #include <usb/ehci-fsl.h>
 #include <hwconfig.h>
 #include <fsl_usb.h>
+#include <fdt_support.h>
 
 #include "ehci.h"
 
+#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
+#endif
+
 static void set_txfifothresh(struct usb_ehci *, u32);
 
 /* Check USB PHY clock valid */
@@ -159,3 +164,111 @@  static void set_txfifothresh(struct usb_ehci *ehci, u32 txfifo_thresh)
 	cmd |= TXFIFO_THRESH(txfifo_thresh);
 	ehci_writel(&ehci->txfilltuning, cmd);
 }
+
+#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
+static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
+				       const char *phy_type, int start_offset)
+{
+	const char *compat_dr = "fsl-usb2-dr";
+	const char *compat_mph = "fsl-usb2-mph";
+	const char *prop_mode = "dr_mode";
+	const char *prop_type = "phy_type";
+	const char *node_type = NULL;
+	int node_offset;
+	int err;
+
+	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("WARNING: could not find compatible node: %s",
+			       fdt_strerror(node_offset));
+			return -1;
+		}
+		node_type = compat_dr;
+	} else {
+		node_type = compat_mph;
+	}
+
+	if (mode) {
+		err = fdt_setprop(blob, node_offset, prop_mode, mode,
+				  strlen(mode) + 1);
+		if (err < 0)
+			printf("WARNING: could not set %s for %s: %s.\n",
+			       prop_mode, node_type, fdt_strerror(err));
+	}
+
+	if (phy_type) {
+		err = fdt_setprop(blob, node_offset, prop_type, phy_type,
+				  strlen(phy_type) + 1);
+		if (err < 0)
+			printf("WARNING: could not set %s for %s: %s.\n",
+			       prop_type, node_type, fdt_strerror(err));
+	}
+
+	return node_offset;
+}
+
+void fdt_fixup_dr_usb(void *blob, bd_t *bd)
+{
+	static const char * const modes[] = { "host", "peripheral", "otg" };
+	static const char * const phys[] = { "ulpi", "utmi" };
+	int usb_mode_off = -1;
+	int usb_phy_off = -1;
+	char str[5];
+	int i, j;
+
+	for (i = 1; i <= CONFIG_USB_MAX_CONTROLLER_COUNT; i++) {
+		const char *dr_mode_type = NULL;
+		const char *dr_phy_type = NULL;
+		int mode_idx = -1, phy_idx = -1;
+
+		snprintf(str, 5, "%s%d", "usb", i);
+		if (hwconfig(str)) {
+			for (j = 0; j < ARRAY_SIZE(modes); j++) {
+				if (hwconfig_subarg_cmp(str, "dr_mode",
+							modes[j])) {
+					mode_idx = j;
+					break;
+				}
+			}
+
+			for (j = 0; j < ARRAY_SIZE(phys); j++) {
+				if (hwconfig_subarg_cmp(str, "phy_type",
+							phys[j])) {
+					phy_idx = j;
+					break;
+				}
+			}
+
+			if (mode_idx < 0 && phy_idx < 0) {
+				printf("WARNING: invalid phy or mode\n");
+				return;
+			}
+
+			if (mode_idx > -1)
+				dr_mode_type = modes[mode_idx];
+
+			if (phy_idx > -1)
+				dr_phy_type = phys[phy_idx];
+		}
+
+		usb_mode_off = fdt_fixup_usb_mode_phy_type(blob,
+							   dr_mode_type, NULL,
+							   usb_mode_off);
+
+		if (usb_mode_off < 0)
+			return;
+
+		usb_phy_off = fdt_fixup_usb_mode_phy_type(blob,
+							  NULL, dr_phy_type,
+							  usb_phy_off);
+
+		if (usb_phy_off < 0)
+			return;
+	}
+}
+#endif