diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-14 08:50:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-14 08:50:00 -0300 |
| commit | 82952b23500fff65871d254f64dc6b96eb13785c (patch) | |
| tree | c2163b0c68d1850db93f865033bf3bba9b403969 /linux/arch/sh/boards/board-ap325rxa.c | |
| parent | 5f440364b00d970a4550481eee1cde036014c44b (diff) | |
| download | mediapointer-dvb-s2-82952b23500fff65871d254f64dc6b96eb13785c.tar.gz mediapointer-dvb-s2-82952b23500fff65871d254f64dc6b96eb13785c.tar.bz2 | |
backport arch arm/sh changes that affected v4l
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/arch/sh/boards/board-ap325rxa.c')
| -rw-r--r-- | linux/arch/sh/boards/board-ap325rxa.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/linux/arch/sh/boards/board-ap325rxa.c b/linux/arch/sh/boards/board-ap325rxa.c index 78a9395fe..912458f66 100644 --- a/linux/arch/sh/boards/board-ap325rxa.c +++ b/linux/arch/sh/boards/board-ap325rxa.c @@ -23,6 +23,7 @@ #include <linux/spi/spi.h> #include <linux/spi/spi_gpio.h> #include <media/ov772x.h> +#include <media/soc_camera.h> #include <media/soc_camera_platform.h> #include <media/sh_mobile_ceu.h> #include <video/sh_mobile_lcdc.h> @@ -166,6 +167,16 @@ static void ap320_wvga_power_on(void *board_data) ctrl_outw(0x100, FPGA_BKLREG); } +static void ap320_wvga_power_off(void *board_data) +{ + /* backlight */ + ctrl_outw(0, FPGA_BKLREG); + gpio_set_value(GPIO_PTS3, 1); + + /* ASD AP-320/325 LCD OFF */ + ctrl_outw(0, FPGA_LCDREG); +} + static struct sh_mobile_lcdc_info lcdc_info = { .clock_source = LCDC_CLK_EXTERNAL, .ch[0] = { @@ -191,6 +202,7 @@ static struct sh_mobile_lcdc_info lcdc_info = { }, .board_cfg = { .display_on = ap320_wvga_power_on, + .display_off = ap320_wvga_power_off, }, } }; @@ -343,9 +355,7 @@ static struct ov772x_camera_info ov7725_info = { }; static struct sh_mobile_ceu_info sh_mobile_ceu_info = { - .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | - SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER | - SOCAM_DATAWIDTH_8, + .flags = SH_CEU_FLAG_USE_8BIT_BUS, }; static struct resource ceu_resources[] = { |