Merge branch 'next'

diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index 7af36dd..3eecee2 100644 (file)
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -25,9 +25,8 @@
 
 #include <common.h>
 #include <i2c.h>
-#if defined(CONFIG_OF_LIBFDT)
 #include <libfdt.h>
-#endif
+#include <fdt_support.h>
 #include <pci.h>
 #include <mpc83xx.h>
 
@@ -122,11 +121,47 @@ void pci_init_board(void)
 }
 
 #if defined(CONFIG_OF_BOARD_SETUP)
+void fdt_tsec1_fixup(void *fdt, bd_t *bd)
+{
+       char *mpc8315erdb = getenv("mpc8315erdb");
+       const char disabled[] = "disabled";
+       const char *path;
+       int ret;
+
+       if (!mpc8315erdb)
+               return;
+
+       if (!strcmp(mpc8315erdb, "tsec1")) {
+               return;
+       } else if (strcmp(mpc8315erdb, "ulpi")) {
+               printf("WARNING: wrong `mpc8315erdb' environment "
+                      "variable specified: `%s'. Should be `ulpi' "
+                      "or `tsec1'.\n", mpc8315erdb);
+               return;
+       }
+
+       ret = fdt_path_offset(fdt, "/aliases");
+       if (ret < 0) {
+               printf("WARNING: can't find /aliases node\n");
+               return;
+       }
+
+       path = fdt_getprop(fdt, ret, "ethernet0", NULL);
+       if (!path) {
+               printf("WARNING: can't find ethernet0 alias\n");
+               return;
+       }
+
+       do_fixup_by_path(fdt, path, "status", disabled, sizeof(disabled), 1);
+}
+
 void ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup(blob, bd);
 #ifdef CONFIG_PCI
        ft_pci_setup(blob, bd);
 #endif
+       fdt_fixup_dr_usb(blob, bd);
+       fdt_tsec1_fixup(blob, bd);
 }
 #endif

diff --git a/common/fdt_support.c b/common/fdt_support.c
index e57ac0a..405b9db 100644 (file)
--- 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 */
 

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index b0cc36d..006b93a 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -321,6 +321,8 @@
 #define CONFIG_NET_MULTI       1
 #endif
 
+#define CONFIG_HAS_FSL_DR_USB
+
 /*
  * TSEC
  */