Patchwork [U-Boot] powerpc/8xxx: Remove dependancy on <usb.h>

login
register
mail settings
Submitter Kumar Gala
Date July 29, 2011, 2:06 p.m.
Message ID <1311948372-21134-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/107397/
State Accepted
Commit 57567361769bfa02d0622c06e5e9f66392e2593a
Headers show

Comments

Kumar Gala - July 29, 2011, 2:06 p.m.
We used <usb.h> for USB_MAX_DEVICE.  However this we requires we actual
build in support for USB into u-boot (which should not be required for
device tree fixup).

At this time no FSL SoC that utilizies this code (83xx/85xx) has more
than 2 USB controllers.  So we replace USB_MAX_DEVICE with a local
define FSL_MAX_NUM_USB_CTRLS.

If/when a device shows up with more than 2 controllers we can easily
bump this value or refactor into a proper define per SoC.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/cpu/mpc8xxx/fdt.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
Wolfgang Denk - July 29, 2011, 8:04 p.m.
Dear Kumar Gala,

In message <1311948372-21134-1-git-send-email-galak@kernel.crashing.org> you wrote:
> We used <usb.h> for USB_MAX_DEVICE.  However this we requires we actual
> build in support for USB into u-boot (which should not be required for
> device tree fixup).

You might want to fix this sentence before committing.  Thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index 6c757f8..285051d 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -30,9 +30,8 @@ 
 #include <asm/fsl_serdes.h>
 #include <phy.h>
 #include <hwconfig.h>
-#ifdef CONFIG_HAS_FSL_DR_USB
-#include <usb.h>
-#endif
+
+#define FSL_MAX_NUM_USB_CTRLS	2
 
 #if defined(CONFIG_MP) && (defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx))
 static int ft_del_cpuhandle(void *blob, int cpuhandle)
@@ -135,7 +134,7 @@  void fdt_fixup_dr_usb(void *blob, bd_t *bd)
 	char str[5];
 	int i, j;
 
-	for (i = 1; i <= USB_MAX_DEVICE; i++) {
+	for (i = 1; i <= FSL_MAX_NUM_USB_CTRLS; i++) {
 		int mode_idx = -1, phy_idx = -1;
 		sprintf(str, "%s%d", "usb", i);
 		if (hwconfig(str)) {