diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-06-16 11:36:17 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-08-11 17:54:54 +0300 |
| commit | 1d3f0cbe0d3a537cbc8fb1a91f6d14407acece62 (patch) | |
| tree | 5967571cd10063d3c246683ada23a1e261a311e1 /drivers/video/fbdev/amba-clcd.c | |
| parent | 046ad6cdeb3f83abcbfa2af88ce471afb2e7fc30 (diff) | |
| download | lwn-1d3f0cbe0d3a537cbc8fb1a91f6d14407acece62.tar.gz lwn-1d3f0cbe0d3a537cbc8fb1a91f6d14407acece62.zip | |
video: ARM CLCD: add special board and panel hooks for Nomadik
In the .board_init() callback will set up a mux register in
the Nomadik system controller. It so happens that the platform
has two display output engines, and we have to poke a bit in
a special register to make sure the right engine is muxed in
as they are mutually exclusive.
The Nomadik CLCD variant is instantiated on a platform where
it is combined with a 800x480 TPO WVGA display. In the
.panel_init() hook we will detect this display from the
compatible string and set it up. We also add .enable() and
.disable() callbacks for it as the sleep state is software
controlled.
The display is connected with a special 3-wire serial bus
(this is sadly neither I2C or SPI) using three GPIO lines that
we bitbang to detect the display and enable/disable sleep
state.
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/fbdev/amba-clcd.c')
| -rw-r--r-- | drivers/video/fbdev/amba-clcd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c index 371f4e2aea6c..2b45c7be4815 100644 --- a/drivers/video/fbdev/amba-clcd.c +++ b/drivers/video/fbdev/amba-clcd.c @@ -35,6 +35,8 @@ #include <video/of_display_timing.h> #include <video/videomode.h> +#include "amba-clcd-nomadik.h" + #define to_clcd(info) container_of(info, struct clcd_fb, fb) /* This is limited to 16 characters when displayed by X startup */ @@ -997,7 +999,7 @@ static int clcdfb_probe(struct amba_device *dev, const struct amba_id *id) if (ret) goto free_fb; - ret = clcdfb_register(fb); + ret = clcdfb_register(fb); if (ret == 0) { amba_set_drvdata(dev, fb); goto out; @@ -1041,6 +1043,8 @@ static struct clcd_vendor_data vendor_nomadik = { .clock_timregs = true, .packed_24_bit_pixels = true, .st_bitmux_control = true, + .init_board = nomadik_clcd_init_board, + .init_panel = nomadik_clcd_init_panel, }; static struct amba_id clcdfb_id_table[] = { |