]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - board/karo/common/fdt.c
karo: fdt: move list of supported touchpanels out of common file
[karo-tx-uboot.git] / board / karo / common / fdt.c
index d0e49ff7bd2ae2d65ff61aeabcaadbbd8ba39c4e..f735d369dd68e5a2d04244611e3ecf5d4b38563f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2012 Lothar Waßmann <LW@KARO-electronics.de>
+ * (C) Copyright 2012,2013 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <nand.h>
+#include <mxcfb.h>
 #include <linux/list.h>
 #include <linux/fb.h>
 #include <jffs2/load_kernel.h>
+#include <malloc.h>
 
 #include "karo.h"
 
@@ -36,7 +38,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static void karo_set_fdtsize(void *fdt)
 {
-       char fdt_size[9];
        size_t fdtsize = getenv_ulong("fdtsize", 16, 0);
 
        if (fdtsize == fdt_totalsize(fdt)) {
@@ -44,9 +45,79 @@ static void karo_set_fdtsize(void *fdt)
        }
        debug("FDT size changed from %u to %u\n",
                fdtsize, fdt_totalsize(fdt));
+       setenv_hex("fdtsize", fdt_totalsize(fdt));
+}
+
+static int karo_load_part(const char *part, void *addr, size_t len)
+{
+       int ret;
+       struct mtd_device *dev;
+       struct part_info *part_info;
+       u8 part_num;
+       size_t actual;
+
+       debug("Initializing mtd_parts\n");
+       ret = mtdparts_init();
+       if (ret)
+               return ret;
+
+       debug("Trying to find NAND partition '%s'\n", part);
+       ret = find_dev_and_part(part, &dev, &part_num, &part_info);
+       if (ret) {
+               printf("Failed to find flash partition '%s': %d\n",
+                       part, ret);
 
-       snprintf(fdt_size, sizeof(fdt_size), "%08x", fdt_totalsize(fdt));
-       setenv("fdtsize", fdt_size);
+               return ret;
+       }
+       debug("Found partition '%s': offset=%08x size=%08x\n",
+               part, part_info->offset, part_info->size);
+       if (part_info->size < len) {
+               printf("Warning: partition '%s' smaller than requested size: %u; truncating data to %u byte\n",
+                       part, len, part_info->size);
+               len = part_info->size;
+       }
+       debug("Reading NAND partition '%s' to %p\n", part, addr);
+       ret = nand_read_skip_bad(&nand_info[0], part_info->offset, &len,
+                               &actual, len, addr);
+       if (ret) {
+               printf("Failed to load partition '%s' to %p\n", part, addr);
+               return ret;
+       }
+       if (actual < len)
+               printf("Read only %u of %u bytes due to bad blocks\n",
+                       actual, len);
+
+       debug("Read %u byte from partition '%s' @ offset %08x\n",
+               len, part, part_info->offset);
+       return 0;
+}
+
+static void *karo_fdt_load_dtb(void)
+{
+       int ret;
+       void *fdt = (void *)getenv_ulong("fdtaddr", 16, CONFIG_SYS_FDT_ADDR);
+
+       if (had_ctrlc()) {
+               printf("aborting DTB load\n");
+               return NULL;
+       }
+
+       /* clear FDT header in memory */
+       memset(fdt, 0, 4);
+
+       ret = karo_load_part("dtb", fdt, MAX_DTB_SIZE);
+       if (ret) {
+               printf("Failed to load dtb from flash: %d\n", ret);
+               return NULL;
+       }
+
+       if (fdt_check_header(fdt)) {
+               debug("No valid DTB in flash\n");
+               return NULL;
+       }
+       debug("Using DTB from flash\n");
+       karo_set_fdtsize(fdt);
+       return fdt;
 }
 
 void karo_fdt_move_fdt(void)
@@ -59,6 +130,8 @@ void karo_fdt_move_fdt(void)
                return;
        }
 
+       setenv("fdtsize", 0);
+
        if (!fdt_addr) {
                fdt_addr = CONFIG_SYS_FDT_ADDR;
                printf("fdtaddr is not set; using default: %08lx\n",
@@ -69,15 +142,22 @@ void karo_fdt_move_fdt(void)
        if (fdt == NULL) {
                fdt = (void *)gd->fdt_blob;
                if (fdt == NULL) {
-                       printf("Compiled in FDT not found\n");
-                       return;
+#ifdef CONFIG_OF_EMBED
+                       printf("Compiled in FDT not found");
+#else
+                       printf("No FDT found");
+#endif
+                       printf("; creating empty DTB\n");
+                       fdt = (void *)fdt_addr;
+                       fdt_create_empty_tree(fdt, 256);
+               } else {
+                       printf("No DTB in flash; using default DTB\n");
                }
                debug("Checking FDT header @ %p\n", fdt);
                if (fdt_check_header(fdt)) {
                        printf("ERROR: No valid DTB found at %p\n", fdt);
                        return;
                }
-               printf("No DTB in flash; using default DTB\n");
                debug("Moving FDT from %p..%p to %08lx..%08lx\n",
                        fdt, fdt + fdt_totalsize(fdt) - 1,
                        fdt_addr, fdt_addr + fdt_totalsize(fdt) - 1);
@@ -96,12 +176,13 @@ void karo_fdt_remove_node(void *blob, const char *node)
        debug("Removing node '%s' from DT\n", node);
 
        if (off < 0) {
-               printf("Could not find node '%s': %d\n", node, off);
+               printf("Could not find node '%s': %s\n", node,
+                       fdt_strerror(off));
        } else {
                ret = fdt_del_node(blob, off);
                if (ret)
-                       printf("Failed to remove node '%s': %d\n",
-                               node, ret);
+                       printf("Failed to remove node '%s': %s\n",
+                               node, fdt_strerror(ret));
        }
        karo_set_fdtsize(blob);
 }
@@ -112,7 +193,8 @@ void karo_fdt_enable_node(void *blob, const char *node, int enable)
 
        debug("%sabling node '%s'\n", enable ? "En" : "Dis", node);
        if (off < 0) {
-               printf("Could not find node '%s': %d\n", node, off);
+               printf("Could not find node '%s': %s\n", node,
+                       fdt_strerror(off));
                return;
        }
        fdt_set_node_status(blob, off,
@@ -121,48 +203,42 @@ void karo_fdt_enable_node(void *blob, const char *node, int enable)
        karo_set_fdtsize(blob);
 }
 
-static const char *karo_touchpanels[] = {
-       "ti,tsc2007",
-       "edt,edt-ft5x06",
-#ifdef CONFIG_MX28
-       "fsl,imx28-lradc",
-#endif
-};
-
-static void fdt_del_tp_node(void *blob, const char *name)
+static void fdt_disable_tp_node(void *blob, const char *name)
 {
        int offs = fdt_node_offset_by_compatible(blob, -1, name);
 
        if (offs < 0) {
-               debug("node '%s' not found: %d\n", name, offs);
+               debug("node '%s' not found: %s\n", name, fdt_strerror(offs));
                return;
        }
 
-       debug("Removing node '%s' from DT\n", name);
-       fdt_del_node(blob, offs);
+       debug("Disabling node '%s'\n", name);
+       fdt_set_node_status(blob, offs, FDT_STATUS_DISABLED, 0);
 }
 
-void karo_fdt_fixup_touchpanel(void *blob)
+void karo_fdt_fixup_touchpanel(void *blob, const char *panels[],
+                       size_t num_panels)
 {
        int i;
        const char *model = getenv("touchpanel");
 
-       for (i = 0; i < ARRAY_SIZE(karo_touchpanels); i++) {
-               const char *tp = karo_touchpanels[i];
-
-               if (model != NULL && strcmp(model, tp) == 0)
-                       continue;
+       for (i = 0; i < num_panels; i++) {
+               const char *tp = panels[i];
 
                if (model != NULL) {
                        if (strcmp(model, tp) == 0)
                                continue;
-                       tp = strchr(tp, ',');
-                       if (tp != NULL && *tp != '\0' && strcmp(model, tp + 1) == 0)
+                       while (tp != NULL) {
+                               if (*tp != '\0' && strcmp(model, tp + 1) == 0)
+                                       break;
+                               tp = strpbrk(tp + 1, ",-");
+                       }
+                       if (tp != NULL)
                                continue;
                }
-               fdt_del_tp_node(blob, karo_touchpanels[i]);
-               karo_set_fdtsize(blob);
+               fdt_disable_tp_node(blob, panels[i]);
        }
+       karo_set_fdtsize(blob);
 }
 
 void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy)
@@ -205,7 +281,7 @@ void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy)
                goto out;
 
        if (disable_otg) {
-               ret = fdt_setprop_string(blob, off, "status", "disabled");
+               ret = fdt_set_node_status(blob, off, FDT_STATUS_DISABLED, 0);
                if (ret)
                        goto out;
        }
@@ -226,19 +302,91 @@ void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy)
 
        if (disable_otg) {
                debug("Disabling usbphy\n");
-               ret = fdt_setprop_string(blob, off, "status", "disabled");
-       } else {
-               debug("Removing host pins from usbphy\n");
-               ret = fdt_delprop(blob, off, "pinctrl-0");
+               ret = fdt_set_node_status(blob, off, FDT_STATUS_DISABLED, 0);
        }
 out:
        if (ret)
-               printf("Failed to update usbotg: %d\n", ret);
+               printf("Failed to update usbotg: %s\n", fdt_strerror(ret));
        else
                debug("node '%s' updated\n", node);
        karo_set_fdtsize(blob);
 }
 
+static int karo_fdt_flexcan_enabled(void *blob)
+{
+       const char *can_ifs[] = {
+               "can0",
+               "can1",
+       };
+       size_t i;
+
+       for (i = 0; i < ARRAY_SIZE(can_ifs); i++) {
+               const char *status;
+               int off = fdt_path_offset(blob, can_ifs[i]);
+
+               if (off < 0) {
+                       debug("node '%s' not found\n", can_ifs[i]);
+                       continue;
+               }
+               status = fdt_getprop(blob, off, "status", NULL);
+               if (status && strcmp(status, "okay") == 0) {
+                       debug("%s is enabled\n", can_ifs[i]);
+                       return 1;
+               }
+       }
+       debug("can driver is disabled\n");
+       return 0;
+}
+
+static void karo_fdt_set_lcd_pins(void *blob, const char *name)
+{
+       int off = fdt_path_offset(blob, name);
+       u32 ph;
+       const struct fdt_property *pc;
+       int len;
+
+       if (off < 0)
+               return;
+
+       ph = fdt_create_phandle(blob, off);
+       if (!ph)
+               return;
+
+       off = fdt_path_offset(blob, "display");
+       if (off < 0)
+               return;
+
+       pc = fdt_get_property(blob, off, "pinctrl-0", &len);
+       if (!pc || len < sizeof(ph))
+               return;
+
+       memcpy((void *)pc->data, &ph, sizeof(ph));
+       fdt_setprop_cell(blob, off, "pinctrl-0", ph);
+}
+
+void karo_fdt_fixup_flexcan(void *blob, int xcvr_present)
+{
+       const char *xcvr_status = "disabled";
+
+       if (xcvr_present) {
+               if (karo_fdt_flexcan_enabled(blob)) {
+                       karo_fdt_set_lcd_pins(blob, "lcdif_23bit_pins_a");
+                       xcvr_status = "okay";
+               } else {
+                       karo_fdt_set_lcd_pins(blob, "lcdif_24bit_pins_a");
+               }
+       } else {
+               const char *otg_mode = getenv("otg_mode");
+
+               if (otg_mode && (strcmp(otg_mode, "host") == 0))
+                       karo_fdt_enable_node(blob, "can1", 0);
+
+               karo_fdt_set_lcd_pins(blob, "lcdif_24bit_pins_a");
+       }
+       fdt_find_and_setprop(blob, "reg_can_xcvr", "status",
+                       xcvr_status, strlen(xcvr_status) + 1, 1);
+}
+
 void karo_fdt_del_prop(void *blob, const char *compat, phys_addr_t offs,
                        const char *prop)
 {
@@ -322,15 +470,15 @@ static int fdt_init_fb_mode(const void *blob, int off, struct fb_videomode *fb_m
        prop = fdt_getprop(blob, off, "vsync-active", NULL);
        if (prop)
                fb_mode->sync |= *prop ? FB_SYNC_VERT_HIGH_ACT : 0;
-#if 0
+
        prop = fdt_getprop(blob, off, "de-active", NULL);
        if (prop)
-               fb_mode->sync |= *prop ? FB_SYNC_DATA_ENABLE_HIGH_ACT : 0;
+               fb_mode->sync |= *prop ? 0 : FB_SYNC_OE_LOW_ACT;
 
        prop = fdt_getprop(blob, off, "pixelclk-active", NULL);
        if (prop)
-               fb_mode->sync |= *prop ? FB_SYNC_DOTCLK_FALLING_ACT : 0;
-#endif
+               fb_mode->sync |= *prop ? 0 : FB_SYNC_CLK_LAT_FALL;
+
        return 0;
 }
 
@@ -338,16 +486,15 @@ static int fdt_update_native_fb_mode(void *blob, int off)
 {
        int ret;
        uint32_t ph;
-       int i;
 
-       for (i = 1; i < 16; i++) {
-               fdt_set_totalsize(blob, fdt_totalsize(blob) + 8 * 4);
-               karo_set_fdtsize(blob);
-               ph = fdt_create_phandle(blob, off);
-               if (ph)
-                       break;
+       ret = fdt_increase_size(blob, 64);
+       if (ret) {
+               printf("Warning: Failed to increase FDT size: %s\n",
+                       fdt_strerror(ret));
        }
-       if (ph == 0) {
+       debug("Creating phandle at offset %d\n", off);
+       ph = fdt_create_phandle(blob, off);
+       if (!ph) {
                printf("Failed to create phandle for video timing\n");
                return -ENOMEM;
        }
@@ -359,6 +506,10 @@ static int fdt_update_native_fb_mode(void *blob, int off)
                return off;
        debug("parent offset=%06x\n", off);
        ret = fdt_setprop_cell(blob, off, "native-mode", ph);
+       if (ret)
+               printf("Failed to set property 'native-mode': %s\n",
+                       fdt_strerror(ret));
+       karo_set_fdtsize(blob);
        return ret;
 }
 
@@ -368,13 +519,15 @@ static int karo_fdt_find_video_timings(void *blob)
        const char *subnode = "display-timings";
 
        if (off < 0) {
-               printf("Could not find node 'display' in FDT: %d\n", off);
+               debug("Could not find node 'display' in FDT: %s\n",
+                       fdt_strerror(off));
                return off;
        }
 
        off = fdt_subnode_offset(blob, off, subnode);
        if (off < 0) {
-               printf("Could not find node '%s' in FDT: %d\n", subnode, off);
+               debug("Could not find node '%s' in FDT: %s\n", subnode,
+                       fdt_strerror(off));
        }
        return off;
 }
@@ -385,167 +538,300 @@ int karo_fdt_get_fb_mode(void *blob, const char *name, struct fb_videomode *fb_m
 
        if (off < 0)
                return off;
-       do {
+       while (off > 0) {
                const char *n, *endp;
                int len, d = 1;
 
                off = fdt_next_node(blob, off, &d);
+               if (off < 0)
+                       return off;
+               if (d < 1)
+                       return -EINVAL;
                if (d > 2) {
-                       printf("Skipping node @ %04x %s depth %d\n", off, fdt_get_name(blob, off, NULL), d);
+                       debug("Skipping node @ %04x %s depth %d\n", off,
+                               fdt_get_name(blob, off, NULL), d);
                        continue;
                }
-               debug("parsing subnode @ %04x %s depth %d\n", off, fdt_get_name(blob, off, NULL), d);
-               if (off < 0 || d < 1)
-                       break;
+               debug("parsing subnode @ %04x %s depth %d\n", off,
+                       fdt_get_name(blob, off, NULL), d);
 
                n = fdt_getprop(blob, off, "panel-name", &len);
                if (!n) {
-                       printf("Missing 'panel-name' property in node '%s'\n",
-                               fdt_get_name(blob, off, NULL));
-                       continue;
-               }
-               for (endp = n + len; n < endp; n += strlen(n) + 1) {
-                       debug("Checking panel-name '%s'\n", n);
+                       n = fdt_get_name(blob, off, NULL);
                        if (strcasecmp(n, name) == 0) {
-                               fdt_init_fb_mode(blob, off, fb_mode);
-                               return fdt_update_native_fb_mode(blob, off);
+                               break;
                        }
+               } else {
+                       int found = 0;
+
+                       for (endp = n + len; n < endp; n += strlen(n) + 1) {
+                               debug("Checking panel-name '%s'\n", n);
+                               if (strcasecmp(n, name) == 0) {
+                                       debug("Using node %s @ %04x\n",
+                                               fdt_get_name(blob, off, NULL), off);
+                                       found = 1;
+                                       break;
+                               }
+                       }
+                       if (found)
+                               break;
                }
-       } while (off > 0);
+       }
+       if (off > 0) {
+               return fdt_init_fb_mode(blob, off, fb_mode);
+       }
        return -EINVAL;
 }
 
-int karo_fdt_update_fb_mode(void *blob, const char *name)
+#define SET_FB_PROP(n, v) ({                                           \
+       int ret;                                                        \
+       ret = fdt_setprop_u32(blob, off, n, v);                         \
+       if (ret) {                                                      \
+               printf("Failed to set property %s: %s\n", name,         \
+                       fdt_strerror(ret));                             \
+       }                                                               \
+       ret;                                                            \
+})
+
+
+int karo_fdt_create_fb_mode(void *blob, const char *name,
+                       struct fb_videomode *fb_mode)
 {
        int off = fdt_path_offset(blob, "display");
+       int ret;
        const char *subnode = "display-timings";
 
-       if (off < 0)
+       if (off < 0) {
+               printf("'display' node not found in FDT\n");
                return off;
+       }
 
-       if (name == NULL) {
-               int parent = fdt_parent_offset(blob, off);
-               int ret;
-
-               if (parent < 0) {
-                       printf("Failed to find parent of node '%s'\n",
-                               fdt_get_name(blob, off, NULL));
-                       return parent;
-               }
-               debug("parent offset=%06x\n", parent);
-               ret = fdt_setprop_string(blob, parent, "status", "disabled");
+       ret = fdt_increase_size(blob, 512);
+       if (ret) {
+               printf("Failed to increase FDT size: %s\n", fdt_strerror(ret));
                return ret;
        }
 
-       off = fdt_subnode_offset(blob, off, subnode);
-       if (off < 0) {
-               printf("Could not find node '%s' in FDT: %d\n", subnode, off);
+       ret = fdt_subnode_offset(blob, off, subnode);
+       if (ret < 0) {
+               debug("Could not find node '%s' in FDT: %s\n", subnode,
+                       fdt_strerror(ret));
+               ret = fdt_add_subnode(blob, off, subnode);
+               if (ret < 0) {
+                       printf("Failed to add %s subnode: %s\n", subnode,
+                               fdt_strerror(ret));
+                       return ret;
+               }
        }
-       do {
-               const char *n, *endp;
-               int len, d = 1;
-               int node = fdt_next_node(blob, off, &d);
-               int do_del;
 
-               if (d > 2) {
-                       printf("Skipping node @ %04x %s depth %d\n", node, fdt_get_name(blob, node, NULL), d);
-                       continue;
-               }
-               debug("parsing subnode @ %04x %s depth %d\n", node, fdt_get_name(blob, node, NULL), d);
-               if (node < 0 || d < 1)
-                       break;
+       ret = fdt_add_subnode(blob, ret, name);
+       if (ret < 0) {
+               printf("Failed to add %s subnode: %s\n", name,
+                       fdt_strerror(ret));
+               return ret;
+       }
+       off = ret;
 
-               n = fdt_getprop(blob, node, "panel-name", &len);
-               if (!n) {
-                       printf("Missing 'panel-name' property in node '%s'\n",
-                               fdt_get_name(blob, node, NULL));
-                       continue;
-               }
-               do_del = 1;
-               for (endp = n + len; n < endp; n += strlen(n) + 1) {
-                       debug("Checking panel-name '%s'\n", n);
-                       if (strcasecmp(n, name) == 0) {
-                               debug("Keeping node %s @ %04x\n",
-                                       fdt_get_name(blob, node, NULL), node);
-                               off = node;
-                               do_del = 0;
-                               break;
-                       }
-               }
-               if (do_del) {
-                       debug("Deleting node %s @ %04x\n",
-                               fdt_get_name(blob, node, NULL), node);
-                       fdt_del_node(blob, node);
-               }
+       ret = SET_FB_PROP("clock-frequency",
+                       PICOS2KHZ(fb_mode->pixclock) * 1000);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("hactive", fb_mode->xres);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("vactive", fb_mode->yres);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("hback-porch", fb_mode->left_margin);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("hsync-len", fb_mode->hsync_len);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("hfront-porch", fb_mode->right_margin);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("vback-porch", fb_mode->upper_margin);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("vsync-len", fb_mode->vsync_len);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("vfront-porch", fb_mode->lower_margin);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("hsync-active",
+                       fb_mode->sync & FB_SYNC_VERT_HIGH_ACT ? 1 : 0);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("vsync-active",
+                       fb_mode->sync & FB_SYNC_VERT_HIGH_ACT ? 1 : 0);
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("de-active",
+                       !(fb_mode->sync & FB_SYNC_OE_LOW_ACT));
+       if (ret)
+               goto out;
+       ret = SET_FB_PROP("pixelclk-active",
+                       !(fb_mode->sync & FB_SYNC_CLK_LAT_FALL));
+out:
+       karo_set_fdtsize(blob);
+       return ret;
+}
 
-       } while (off > 0);
+static int karo_fdt_set_display_alias(void *blob, const char *path,
+                               const char *name)
+{
+       int ret;
+       int off;
+       size_t size = strlen(path) + strlen(name) + 2;
+       char *display;
 
-       return 0;
+       display = malloc(size);
+       if (display == NULL) {
+               printf("%s: Failed to allocate buffer\n", __func__);
+               return -ENOMEM;
+       }
+       sprintf(display, "%s/%s", path, name);
+       if (strlen(display) != size - 1)
+               hang();
+       off = fdt_path_offset(blob, "/aliases");
+       if (off == FDT_ERR_BADMAGIC)
+               return -EINVAL;
+       ret = fdt_resize(blob);
+       if (ret < 0) {
+               printf("%s: Failed to resize FDT: %s\n",
+                       __func__, fdt_strerror(ret));
+       }
+       if (off < 0) {
+               off = fdt_add_subnode(blob, 0, "aliases");
+               if (off < 0) {
+                       printf("%s: Failed to create 'aliases' node: %s\n",
+                               __func__, fdt_strerror(off));
+                       return off;
+               }
+       }
+       ret = fdt_setprop_string(blob, off, "display", display);
+       debug("setprop_string(display='%s') returned %d (%s)\n", display, ret,
+               ret < 0 ? fdt_strerror(ret) : "OK");
+       return ret;
 }
 
-static int karo_load_part(const char *part, void *addr, size_t len)
+const char *karo_fdt_set_display(const char *video_mode, const char *lcd_path,
+                               const char *lvds_path)
 {
+       const char *vmode = NULL;
        int ret;
-       struct mtd_device *dev;
-       struct part_info *part_info;
-       u8 part_num;
+       void *blob = working_fdt;
 
-       debug("Initializing mtd_parts\n");
-       ret = mtdparts_init();
-       if (ret)
-               return ret;
+       if (video_mode == NULL || strlen(video_mode) == 0)
+               return NULL;
 
-       debug("Trying to find NAND partition '%s'\n", part);
-       ret = find_dev_and_part(part, &dev, &part_num,
-                               &part_info);
-       if (ret) {
-               printf("Failed to find flash partition '%s': %d\n",
-                       part, ret);
+       vmode = strchr(video_mode, ':');
+
+       if (lvds_path == NULL)
+               return vmode ? vmode + 1 : video_mode;
+
+       if (lvds_path != NULL && vmode != NULL) {
+               if (strncmp(video_mode, "LVDS:", 5) == 0 ||
+                       strncmp(video_mode, "LVDS0:", 6) == 0) {
+                       ret = karo_fdt_set_display_alias(blob, lvds_path,
+                                                       "lvds-channel@0");
+               } else if (strncmp(video_mode, "LVDS1:", 6) == 0) {
+                       ret = karo_fdt_set_display_alias(blob, lvds_path,
+                                                       "lvds-channel@1");
+               } else {
+                       debug("%s: Syntax error in video_mode\n", __func__);
+                       return vmode + 1;
+               }
+               video_mode = vmode + 1;
+       } else {
+               int off;
 
-               return ret;
-       }
-       debug("Found partition '%s': offset=%08x size=%08x\n",
-               part, part_info->offset, part_info->size);
-       if (part_info->size < len) {
-               printf("Warning: partition '%s' smaller than requested size: %u; truncating data to %u byte\n",
-                       part, len, part_info->size);
-               len = part_info->size;
+               ret = karo_fdt_set_display_alias(blob, lcd_path,
+                                               "display@di0");
+
+               off = fdt_path_offset(blob, "lvds0");
+               if (off >= 0) {
+                       ret = fdt_set_node_status(blob, off,
+                                               FDT_STATUS_DISABLED, 0);
+               }
+               off = fdt_path_offset(blob, "lvds1");
+               if (off >= 0) {
+                       ret = fdt_set_node_status(blob, off,
+                                               FDT_STATUS_DISABLED, 0);
+               }
        }
-       debug("Reading NAND partition '%s' to %p\n", part, addr);
-       ret = nand_read_skip_bad(&nand_info[0], part_info->offset, &len, addr);
        if (ret) {
-               printf("Failed to load partition '%s' to %p\n", part, addr);
-               return ret;
+               printf("%s: failed to set 'display' alias: %s\n",
+                       __func__, fdt_strerror(ret));
        }
-       debug("Read %u byte from partition '%s' @ offset %08x\n",
-               len, part, part_info->offset);
-       return 0;
+       return video_mode;
 }
 
-void *karo_fdt_load_dtb(void)
+int karo_fdt_update_fb_mode(void *blob, const char *name)
 {
-       int ret;
-       void *fdt = (void *)getenv_ulong("fdtaddr", 16, CONFIG_SYS_FDT_ADDR);
+       int off = fdt_path_offset(blob, "display");
+       const char *subnode = "display-timings";
 
-       if (tstc()) {
-               debug("aborting DTB load\n");
-               return NULL;
-       }
+       if (off < 0)
+               return off;
 
-       /* clear FDT header in memory */
-       memset(fdt, 0, 4);
+       if (name == NULL) {
+               int ret;
 
-       ret = karo_load_part("dtb", fdt, MAX_DTB_SIZE);
-       if (ret) {
-               printf("Failed to load dtb from flash: %d\n", ret);
-               return NULL;
+               debug("Disabling node '%s' at %03x\n",
+                       fdt_get_name(blob, off, NULL), off);
+               ret = fdt_set_node_status(blob, off, FDT_STATUS_DISABLED, 0);
+               return ret;
        }
 
-       if (fdt_check_header(fdt)) {
-               debug("No valid DTB in flash\n");
-               return NULL;
+       off = fdt_subnode_offset(blob, off, subnode);
+       if (off < 0) {
+               debug("Could not find node '%s' in FDT: %s\n", subnode,
+                       fdt_strerror(off));
+               return off;
        }
-       debug("Using DTB from flash\n");
-       karo_set_fdtsize(fdt);
-       return fdt;
+       while (off > 0) {
+               const char *n, *endp;
+               int len, d = 1;
+
+               off = fdt_next_node(blob, off, &d);
+               if (off < 0)
+                       return off;
+               if (d < 1)
+                       return -EINVAL;
+               if (d > 2) {
+                       debug("Skipping node @ %04x %s depth %d\n", off,
+                               fdt_get_name(blob, off, NULL), d);
+                       continue;
+               }
+               debug("parsing subnode @ %04x %s depth %d\n", off,
+                       fdt_get_name(blob, off, NULL), d);
+
+               n = fdt_getprop(blob, off, "panel-name", &len);
+               if (!n) {
+                       n = fdt_get_name(blob, off, NULL);
+                       if (strcasecmp(n, name) == 0) {
+                               break;
+                       }
+               } else {
+                       int found = 0;
+
+                       for (endp = n + len; n < endp; n += strlen(n) + 1) {
+                               debug("Checking panel-name '%s'\n", n);
+                               if (strcasecmp(n, name) == 0) {
+                                       debug("Using node %s @ %04x\n",
+                                               fdt_get_name(blob, off, NULL), off);
+                                       found = 1;
+                                       break;
+                               }
+                       }
+                       if (found)
+                               break;
+               }
+       }
+       if (off > 0)
+               return fdt_update_native_fb_mode(blob, off);
+       return off;
 }