Add support for fixing usb mode and phy type for
MPH(Multi Port Host) USB controllers in device-tree nodes.
Required for socs like P3060, P5020, etc having MPH USB controller.
Signed-off-by: Ramneek Mehresh ramneek.mehr...@freescale.com
---
arch/powerpc/cpu/mpc8xxx/fdt.c | 46 ++--
include/fdt_support.h |4 +-
2 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index d07ae1b..b22e0ec 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2011 Freescale Semiconductor, Inc.
+ * Copyright 2009-2012 Freescale Semiconductor, Inc.
*
* This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and
* arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains
@@ -86,30 +86,38 @@ void ft_fixup_num_cores(void *blob) {
}
#endif /* defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) */
-#ifdef CONFIG_HAS_FSL_DR_USB
+#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 = fsl-usb2-dr;
+ const char *compat[] = {fsl-usb2-mph, fsl-usb2-dr};
const char *prop_mode = dr_mode;
const char *prop_type = phy_type;
+ char *node_type = NULL;
int node_offset;
int err;
node_offset = fdt_node_offset_by_compatible(blob,
- start_offset, compat);
+ start_offset, compat[0]);
if (node_offset 0) {
- printf(WARNING: could not find compatible node %s: %s.\n,
- compat, fdt_strerror(node_offset));
- return -1;
- }
+ node_offset = fdt_node_offset_by_compatible(blob,
+ start_offset, compat[1]);
+ if (node_offset 0) {
+ printf(WARNING: could not find compatible
+node %s or %s: %s.\n, compat[0],
+ compat[1], fdt_strerror(node_offset));
+ return -1;
+ } else
+ node_type = (char *)compat[1];
+ } else
+ node_type = (char *)compat[0];
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, compat, fdt_strerror(err));
+ prop_mode, node_type, fdt_strerror(err));
}
if (phy_type) {
@@ -117,7 +125,7 @@ static int fdt_fixup_usb_mode_phy_type(void *blob, const
char *mode,
strlen(phy_type) + 1);
if (err 0)
printf(WARNING: could not set %s for %s: %s.\n,
- prop_type, compat, fdt_strerror(err));
+ prop_type, node_type, fdt_strerror(err));
}
return node_offset;
@@ -137,28 +145,34 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd)
for (i = 1; i = FSL_MAX_NUM_USB_CTRLS; i++) {
int mode_idx = -1, phy_idx = -1;
- sprintf(str, %s%d, usb, i);
+ snprintf(str, 5, %s%d, usb, i);
if (hwconfig(str)) {
- for (j = 0; j sizeof(modes); j++) {
+ for (j = 0; j sizeof(modes)/sizeof(char *); j++) {
if (hwconfig_subarg_cmp(str, dr_mode,
modes[j])) {
mode_idx = j;
break;
}
}
- for (j = 0; j sizeof(phys); j++) {
+ for (j = 0; j sizeof(phys)/sizeof(char *); j++) {
if (hwconfig_subarg_cmp(str, phy_type,
phys[j])) {
phy_idx = j;
break;
}
}
- if (mode_idx = 0)
+ if (mode_idx = 0) {
usb_mode_off = fdt_fixup_usb_mode_phy_type(blob,
modes[mode_idx], NULL, usb_mode_off);
- if (phy_idx = 0)
+ if (usb_mode_off 0)
+ return;
+ }
+ if (phy_idx = 0) {
usb_phy_off = fdt_fixup_usb_mode_phy_type(blob,
NULL,
