summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@free.fr>2012-02-16 19:23:48 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-02-17 10:18:30 +0100
commitb1cf1685d3429e82459adceeed20873a4c088cfa (patch)
treec1fdafbdd01e1d0496fcc9a8f838e01b51a17b79
parentbf841a598e0ce6550c477875fe8567bc507d8d23 (diff)
downloadbarebox-b1cf1685d3429e82459adceeed20873a4c088cfa.tar.gz
barebox-b1cf1685d3429e82459adceeed20873a4c088cfa.tar.xz
drivers/video: remove pxafb enable on load
As pxafb can rely on a PWM to control backlight, and because driver dependencies are hard to deal with, remove automatic enable of PXAFB on probe. The user should in its environment do a : - fb0.enable=1 This way, the PWM has been probed and is ready to work, and the pxafb backlight control works. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-pxa/include/mach/pxafb.h1
-rw-r--r--drivers/video/pxa.c3
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h
index 1730fbffbf..23cbea99c8 100644
--- a/arch/arm/mach-pxa/include/mach/pxafb.h
+++ b/arch/arm/mach-pxa/include/mach/pxafb.h
@@ -64,7 +64,6 @@ struct pxafb_videomode {
struct pxafb_platform_data {
struct pxafb_videomode *mode;
unsigned int lcd_conn;
- int enable_on_load;
/** force a memory area to be used, else NULL for dynamic allocation */
void *framebuffer;
diff --git a/drivers/video/pxa.c b/drivers/video/pxa.c
index ddd70878ec..900ae80165 100644
--- a/drivers/video/pxa.c
+++ b/drivers/video/pxa.c
@@ -538,9 +538,6 @@ static int pxafb_probe(struct device_d *dev)
return ret;
}
- if (pdata->enable_on_load)
- info->fbops->fb_enable(info);
-
return 0;
}