From 60ac5ea5e6970636da480ecb9f629192a7830126 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Thu, 9 Jan 2014 11:51:08 +0100 Subject: [PATCH] karo: fdt: disable can1 interface also for LVDS modules --- board/karo/common/fdt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/board/karo/common/fdt.c b/board/karo/common/fdt.c index b58bec5f56..5f6fd4888d 100644 --- a/board/karo/common/fdt.c +++ b/board/karo/common/fdt.c @@ -383,6 +383,7 @@ void karo_fdt_fixup_flexcan(void *blob, int xcvr_present) { int ret; const char *xcvr_status = xcvr_present ? "disabled" : NULL; + const char *otg_mode = getenv("otg_mode"); #ifndef CONFIG_SYS_LVDS_IF if (xcvr_present) { @@ -393,14 +394,12 @@ void karo_fdt_fixup_flexcan(void *blob, int xcvr_present) 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"); } #endif + if (otg_mode && strcmp(otg_mode, "host") == 0) + karo_fdt_enable_node(blob, "can1", 0); + if (xcvr_status) { debug("Disabling CAN XCVR\n"); ret = fdt_find_and_setprop(blob, "reg_can_xcvr", "status", -- 2.39.2