Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

[karo-tx-uboot.git] / arch / powerpc / cpu / mpc8xxx / fdt.c

diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index 5bb9f53542299f85cc585a9b482639910014810d..d07ae1b4fe278d4a850d95c5bdbdda7bc83e1804 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -87,13 +87,12 @@ void ft_fixup_num_cores(void *blob) {
 #endif /* defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) */
 
 #ifdef CONFIG_HAS_FSL_DR_USB
-static void fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
-                               const char *phy_type)
+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 *prop_mode = "dr_mode";
        const char *prop_type = "phy_type";
-       static int start_offset = -1;
        int node_offset;
        int err;
 
@@ -102,7 +101,7 @@ static void fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
        if (node_offset < 0) {
                printf("WARNING: could not find compatible node %s: %s.\n",
                        compat, fdt_strerror(node_offset));
-               return;
+               return -1;
        }
 
        if (mode) {
@@ -121,16 +120,18 @@ static void fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
                               prop_type, compat, fdt_strerror(err));
        }
 
-       start_offset = node_offset;
+       return node_offset;
 }
 
 void fdt_fixup_dr_usb(void *blob, bd_t *bd)
 {
        const char *modes[] = { "host", "peripheral", "otg" };
-       const char *phys[] = { "ulpi", "umti" };
+       const char *phys[] = { "ulpi", "utmi" };
        const char *mode = NULL;
        const char *phy_type = NULL;
        char usb1_defined = 0;
+       int usb_mode_off = -1;
+       int usb_phy_off = -1;
        char str[5];
        int i, j;
 
@@ -153,11 +154,11 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd)
                                }
                        }
                        if (mode_idx >= 0)
-                               fdt_fixup_usb_mode_phy_type(blob,
-                                       modes[mode_idx], NULL);
+                               usb_mode_off = fdt_fixup_usb_mode_phy_type(blob,
+                                       modes[mode_idx], NULL, usb_mode_off);
                        if (phy_idx >= 0)
-                               fdt_fixup_usb_mode_phy_type(blob,
-                                       NULL, phys[phy_idx]);
+                               usb_phy_off = fdt_fixup_usb_mode_phy_type(blob,
+                                       NULL, phys[phy_idx], usb_phy_off);
                        if (!strcmp(str, "usb1"))
                                usb1_defined = 1;
                        if (mode_idx < 0 && phy_idx < 0)
@@ -165,11 +166,12 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd)
                }
        }
        if (!usb1_defined) {
+               int usb_off = -1;
                mode = getenv("usb_dr_mode");
                phy_type = getenv("usb_phy_type");
                if (!mode && !phy_type)
                        return;
-               fdt_fixup_usb_mode_phy_type(blob, mode, phy_type);
+               fdt_fixup_usb_mode_phy_type(blob, mode, phy_type, usb_off);
        }
 }
 #endif /* CONFIG_HAS_FSL_DR_USB */
@@ -275,21 +277,73 @@ int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc)
 }
 
 #ifdef CONFIG_SYS_SRIO
+static inline void ft_disable_srio_port(void *blob, int srio_off, int port)
+{
+       int off = fdt_node_offset_by_prop_value(blob, srio_off,
+                       "cell-index", &port, 4);
+       if (off >= 0) {
+               off = fdt_setprop_string(blob, off, "status", "disabled");
+               if (off > 0)
+                       printf("WARNING unable to set status for fsl,srio "
+                               "port %d: %s\n", port, fdt_strerror(off));
+       }
+}
+
+static inline void ft_disable_rman(void *blob)
+{
+       int off = fdt_node_offset_by_compatible(blob, -1, "fsl,rman");
+       if (off >= 0) {
+               off = fdt_setprop_string(blob, off, "status", "disabled");
+               if (off > 0)
+                       printf("WARNING unable to set status for fsl,rman %s\n",
+                               fdt_strerror(off));
+       }
+}
+
+static inline void ft_disable_rmu(void *blob)
+{
+       int off = fdt_node_offset_by_compatible(blob, -1, "fsl,srio-rmu");
+       if (off >= 0) {
+               off = fdt_setprop_string(blob, off, "status", "disabled");
+               if (off > 0)
+                       printf("WARNING unable to set status for "
+                               "fsl,srio-rmu %s\n", fdt_strerror(off));
+       }
+}
+
 void ft_srio_setup(void *blob)
 {
+       int srio1_used = 0, srio2_used = 0;
+       int srio_off;
+
+       /* search for srio node, if doesn't exist just return - nothing todo */
+       srio_off = fdt_node_offset_by_compatible(blob, -1, "fsl,srio");
+       if (srio_off < 0)
+               return ;
+
 #ifdef CONFIG_SRIO1
-       if (!is_serdes_configured(SRIO1)) {
-               fdt_del_node_and_alias(blob, "rio0");
-       }
-#else
-       fdt_del_node_and_alias(blob, "rio0");
+       if (is_serdes_configured(SRIO1))
+               srio1_used = 1;
 #endif
 #ifdef CONFIG_SRIO2
-       if (!is_serdes_configured(SRIO2)) {
-               fdt_del_node_and_alias(blob, "rio1");
-       }
-#else
-       fdt_del_node_and_alias(blob, "rio1");
+       if (is_serdes_configured(SRIO2))
+               srio2_used = 1;
 #endif
+
+       /* mark port1 disabled */
+       if (!srio1_used)
+               ft_disable_srio_port(blob, srio_off, 1);
+
+       /* mark port2 disabled */
+       if (!srio2_used)
+               ft_disable_srio_port(blob, srio_off, 2);
+
+       /* if both ports not used, disable controller, rmu and rman */
+       if (!srio1_used && !srio2_used) {
+               fdt_setprop_string(blob, srio_off, "status", "disabled");
+
+               ft_disable_rman(blob);
+               ft_disable_rmu(blob);
+       }
 }
 #endif