[U-Boot-Users] [PATCH 6/7] 83xx/fdt_support: let user specifiy FSL USB Dual-Role controller role

[Anton Vorontsov <avorontsov@ru.mvista.com>]

On Wed, Mar 19, 2008 at 08:35:58PM -0500, Kim Phillips wrote:
> On Fri, 14 Mar 2008 23:20:18 +0300
> Anton Vorontsov <avorontsov@ru.mvista.com> wrote:
> 
> 
> > diff --git a/include/fdt_support.h b/include/fdt_support.h
> > index 7836f28..c10de8a 100644
> > --- a/include/fdt_support.h
> > +++ b/include/fdt_support.h
> > @@ -50,6 +50,12 @@ int fdt_find_and_setprop(void *fdt, const char *node, const char *prop,
> >  			 const void *val, int len, int create);
> >  void fdt_fixup_qe_firmware(void *fdt);
> >  
> > +#ifdef CONFIG_HAS_FSL_DR_USB
> > +void fdt_fixup_dr_usb(void *blob, bd_t *bd);
> > +#else
> > +static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {}
> > +#endif /* CONFIG_HAS_FSL_DR_USB */
> > +
> 
> this looks like a prime candidate for a weak function (which would also
> eliminate the need for the new CONFIG_HAS_FSL_DR_USB introduced here).

Are you sure it's supposed to work like this?.. I don't see the linker
dropping unused weak symbols with the patch below.

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index d091538..70f52da 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <fdt_support.h>
 #include <i2c.h>
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
@@ -197,5 +198,6 @@ void ft_board_setup(void *blob, bd_t *bd)
 	ft_pci_setup(blob, bd);
 #endif
 	ft_cpu_setup(blob, bd);
+	/* fdt_fixup_dr_usb(blob); */
 }
 #endif /* CONFIG_OF_BOARD_SETUP */
diff --git a/common/fdt_support.c b/common/fdt_support.c
index 69eb667..22a2d99 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -615,3 +615,26 @@ void fdt_fixup_ethernet(void *fdt, bd_t *bd)
 	}
 }
 #endif
+
+void __attribute__((weak)) fdt_fixup_dr_usb(void *fdt)
+{
+	char *mode;
+	const char *compat = "fsl-usb2-dr";
+	const char *prop = "dr_mode";
+	int node_offset;
+	int err;
+
+	mode = getenv("usb_dr_mode");
+	if (!mode)
+		return;
+
+	node_offset = fdt_node_offset_by_compatible(fdt, 0, compat);
+	if (node_offset < 0)
+		printf("WARNING: could not find compatible node %s: %s.\n",
+			compat, fdt_strerror(node_offset));
+
+	err = fdt_setprop(fdt, 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));
+}
diff --git a/include/fdt_support.h b/include/fdt_support.h
index 7836f28..9e980b8 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -49,6 +49,7 @@ void fdt_fixup_ethernet(void *fdt, bd_t *bd);
 int fdt_find_and_setprop(void *fdt, const char *node, const char *prop,
 			 const void *val, int len, int create);
 void fdt_fixup_qe_firmware(void *fdt);
+void __attribute__((weak)) fdt_fixup_dr_usb(void *fdt);
 
 #ifdef CONFIG_OF_HAS_UBOOT_ENV
 int fdt_env(void *fdt);
-- 
1.5.2.2