83xx/fdt_support: let user specifiy FSL USB Dual-Role controller role

Linux understands "host" (default), "peripheral" and "otg" (broken).
Though, U-Boot doesn't restrict dr_mode variable to these values (think
of renames in future).

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index d09153805820cc22e8ddb81fa8fe2d7e7ea1df7b..83fb60da004476e6a911ff87bed4899d456081ef 100644 (file)
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -197,5 +197,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, bd);
 }
 #endif /* CONFIG_OF_BOARD_SETUP */

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 36e1469c0c4605379170b7a38063a813d6b9a5f6..75077442d85dbc2fc38ae02e80be1c5485b391c9 100644 (file)
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -422,3 +422,28 @@ void fdt_fixup_ethernet(void *fdt, bd_t *bd)
        }
 }
 #endif
+
+#ifdef CONFIG_HAS_FSL_DR_USB
+void fdt_fixup_dr_usb(void *blob, bd_t *bd)
+{
+       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(blob, 0, compat);
+       if (node_offset < 0)
+               printf("WARNING: could not find compatible node %s: %s.\n",
+                       compat, fdt_strerror(node_offset));
+
+       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));
+}
+#endif /* CONFIG_HAS_FSL_DR_USB */

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index b2f54e10b3a7243038c52ba0954624869631c00e..90812e92a9dd5865c562d9c160fbd51278bba071 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -591,6 +591,8 @@
 #define CONFIG_ETH1ADDR                00:04:9f:ef:04:02
 #endif
 
+#define CONFIG_HAS_FSL_DR_USB
+
 #define CONFIG_IPADDR          10.0.0.2
 #define CONFIG_SERVERIP                10.0.0.1
 #define CONFIG_GATEWAYIP       10.0.0.1

diff --git a/include/fdt_support.h b/include/fdt_support.h
index 5ef69839d53483feba272566f0fb7615c5fdbf24..890993ff9d1fa8fa838f5a80c4d645f3a45aecbb 100644 (file)
--- 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 */
+
 #ifdef CONFIG_OF_BOARD_SETUP
 void ft_board_setup(void *blob, bd_t *bd);
 void ft_cpu_setup(void *blob, bd_t *bd);