summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3282f92)
DT property names should not contain underscores but dashes as word
delimiters. The DT files in Linux have been updated to reflect this.
For compatibility with older DTBs support both variants of certain
property names.
if (karo_fdt_flexcan_enabled(blob)) {
if (!is_lvds()) {
debug("Changing LCD to use 23bits only\n");
if (karo_fdt_flexcan_enabled(blob)) {
if (!is_lvds()) {
debug("Changing LCD to use 23bits only\n");
+ karo_fdt_set_lcd_pins(blob, "lcdif-23bit-pins-a");
+ /* handle legacy alias name */
karo_fdt_set_lcd_pins(blob, "lcdif_23bit_pins_a");
xcvr_status = NULL;
}
} else if (!is_lvds()) {
debug("Changing LCD to use 24bits\n");
karo_fdt_set_lcd_pins(blob, "lcdif_23bit_pins_a");
xcvr_status = NULL;
}
} else if (!is_lvds()) {
debug("Changing LCD to use 24bits\n");
+ karo_fdt_set_lcd_pins(blob, "lcdif-24bit-pins-a");
+ /* handle legacy alias name */
karo_fdt_set_lcd_pins(blob, "lcdif_24bit_pins_a");
}
} else {
karo_fdt_set_lcd_pins(blob, "lcdif_24bit_pins_a");
}
} else {
off = fdt_path_offset(blob, "can1");
if (off >= 0)
fdt_delprop(blob, off, "xceiver-supply");
off = fdt_path_offset(blob, "can1");
if (off >= 0)
fdt_delprop(blob, off, "xceiver-supply");
+ if (!is_lvds()) {
+ karo_fdt_set_lcd_pins(blob, "lcdif-24bit-pins-a");
+ /* handle legacy alias name */
karo_fdt_set_lcd_pins(blob, "lcdif_24bit_pins_a");
karo_fdt_set_lcd_pins(blob, "lcdif_24bit_pins_a");
}
if (otg_mode && strcasecmp(otg_mode, "host") == 0)
}
if (otg_mode && strcasecmp(otg_mode, "host") == 0)
if (xcvr_status) {
debug("Disabling CAN XCVR\n");
if (xcvr_status) {
debug("Disabling CAN XCVR\n");
- ret = fdt_find_and_setprop(blob, "reg_can_xcvr", "status",
+ ret = fdt_find_and_setprop(blob, "reg-can-xcvr", "status",
xcvr_status, strlen(xcvr_status) + 1, 1);
xcvr_status, strlen(xcvr_status) + 1, 1);
+ if (ret == -FDT_ERR_NOTFOUND)
+ ret = fdt_find_and_setprop(blob, "reg_can_xcvr", "status",
+ xcvr_status, strlen(xcvr_status) + 1, 1);
+ if (ret != -FDT_ERR_NOTFOUND)
printf("Failed to disable CAN transceiver switch: %s\n",
fdt_strerror(ret));
}
printf("Failed to disable CAN transceiver switch: %s\n",
fdt_strerror(ret));
}