Browse Source

video: ARM CLCD: fix Vexpress regression

The CLCD does not come up on Versatile Express as it does not
(currently) have a syscon node for controlling the block apart
from the CLCD itself. Make sure the .init() function can bail
out without an error making it probe again.

Reported-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Amit Pundir <amit.pundir@linaro.org>
Tested-by: Nicolae Rosia <nicolae_rosia@mentor.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Linus Walleij 8 years ago
parent
commit
cfbd950d5e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/video/fbdev/amba-clcd-versatile.c

+ 2 - 2
drivers/video/fbdev/amba-clcd-versatile.c

@@ -526,8 +526,8 @@ int versatile_clcd_init_panel(struct clcd_fb *fb,
 	np = of_find_matching_node_and_match(NULL, versatile_clcd_of_match,
 	np = of_find_matching_node_and_match(NULL, versatile_clcd_of_match,
 					     &clcd_id);
 					     &clcd_id);
 	if (!np) {
 	if (!np) {
-		dev_err(dev, "no Versatile syscon node\n");
-		return -ENODEV;
+		/* Vexpress does not have this */
+		return 0;
 	}
 	}
 	versatile_clcd_type = (enum versatile_clcd)clcd_id->data;
 	versatile_clcd_type = (enum versatile_clcd)clcd_id->data;