summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2008-08-25 17:02:10 -0500
committerKim Phillips <kim.phillips@freescale.com>2008-08-25 17:02:10 -0500
commitce0eb70333331da6942167c41e6841c8c7994a33 (patch)
tree225f0feda257a0c63f6226a421abf8873254a374 /common
parenta49d10cf027d059ee15c262010a05cdaec0961e1 (diff)
parent021f6df6e96af5b387810cf96d24848da1faa55c (diff)
downloadu-boot-imx-ce0eb70333331da6942167c41e6841c8c7994a33.zip
u-boot-imx-ce0eb70333331da6942167c41e6841c8c7994a33.tar.gz
u-boot-imx-ce0eb70333331da6942167c41e6841c8c7994a33.tar.bz2
Merge branch 'next'
Diffstat (limited to 'common')
-rw-r--r--common/fdt_support.c30
1 files changed, 23 insertions, 7 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c
index e57ac0a..405b9db 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -408,24 +408,40 @@ void fdt_fixup_ethernet(void *fdt)
void fdt_fixup_dr_usb(void *blob, bd_t *bd)
{
char *mode;
+ char *type;
const char *compat = "fsl-usb2-dr";
- const char *prop = "dr_mode";
+ const char *prop_mode = "dr_mode";
+ const char *prop_type = "phy_type";
int node_offset;
int err;
mode = getenv("usb_dr_mode");
- if (!mode)
+ type = getenv("usb_phy_type");
+ if (!mode && !type)
return;
node_offset = fdt_node_offset_by_compatible(blob, 0, compat);
- if (node_offset < 0)
+ if (node_offset < 0) {
printf("WARNING: could not find compatible node %s: %s.\n",
compat, fdt_strerror(node_offset));
+ return;
+ }
- err = fdt_setprop(blob, node_offset, prop, mode, strlen(mode) + 1);
- if (err < 0)
- printf("WARNING: could not set %s for %s: %s.\n",
- prop, compat, fdt_strerror(err));
+ 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));
+ }
+
+ if (type) {
+ err = fdt_setprop(blob, node_offset, prop_type, type,
+ strlen(type) + 1);
+ if (err < 0)
+ printf("WARNING: could not set %s for %s: %s.\n",
+ prop_type, compat, fdt_strerror(err));
+ }
}
#endif /* CONFIG_HAS_FSL_DR_USB */