sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

powerpc/8xxx: Remove dependency on <usb.h> 

We used <usb.h> for USB_MAX_DEVICE.  However this 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>
This commit is contained in:
Kumar Gala 2011-07-29 08:51:26 -05:00
parent a3a3e7b2c3
commit 5756736176
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/cpu/mpc8xxx/fdt.c
View File

@ -30,9 +30,8 @@
#include <asm/fsl_serdes.h> #include <asm/fsl_serdes.h>
#include <phy.h> #include <phy.h>
#include <hwconfig.h> #include <hwconfig.h>
#ifdef CONFIG_HAS_FSL_DR_USB
#include <usb.h> #define FSL_MAX_NUM_USB_CTRLS 2
#endif
#if defined(CONFIG_MP) && (defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)) #if defined(CONFIG_MP) && (defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx))
static int ft_del_cpuhandle(void *blob, int cpuhandle) 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]; char str[5];
int i, j; 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; int mode_idx = -1, phy_idx = -1;
sprintf(str, "%s%d", "usb", i); sprintf(str, "%s%d", "usb", i);
if (hwconfig(str)) { if (hwconfig(str)) {