diff options
| author | Manjunath Hadli <manjunath.hadli@ti.com> | 2012-02-23 15:17:45 +0530 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2012-03-11 12:41:29 +0530 |
| commit | af946f269973cda86d7263ac9f2dad659773545c (patch) | |
| tree | 89113f2c96f0a8efb4e2fee85aacc166504d5657 /arch/arm/mach-davinci/davinci.h | |
| parent | 12db9588ff811ae43a476b1234b27323055ab3ad (diff) | |
| download | blackbird-op-linux-af946f269973cda86d7263ac9f2dad659773545c.tar.gz blackbird-op-linux-af946f269973cda86d7263ac9f2dad659773545c.zip | |
ARM: davinci: dm644x: add support for v4l2 video display
Add functions to register various video devices like venc, osd,
vpbe and the v4l2 display driver for dm644x.
Change dm644x_init_video() to make room for display related
configuration. Register the vpfe or vpbe devices only if valid
display configuration is provided to make sure boards without
video support dont erroneously register video devices.
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/davinci.h')
| -rw-r--r-- | arch/arm/mach-davinci/davinci.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index 9d708034b57f..3e519dad5bb9 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -29,9 +29,15 @@ #include <media/davinci/vpfe_capture.h> #include <media/davinci/vpif_types.h> +#include <media/davinci/vpss.h> +#include <media/davinci/vpbe_types.h> +#include <media/davinci/vpbe_venc.h> +#include <media/davinci/vpbe.h> +#include <media/davinci/vpbe_osd.h> #define DAVINCI_SYSTEM_MODULE_BASE 0x01c40000 #define SYSMOD_VIDCLKCTL 0x38 +#define SYSMOD_VPSS_CLKCTL 0x44 #define SYSMOD_VDD3P3VPWDN 0x48 #define SYSMOD_VSCLKDIS 0x6c #define SYSMOD_PUPDCTL1 0x7c @@ -83,7 +89,7 @@ void dm365_set_vpfe_config(struct vpfe_config *cfg); /* DM644x function declarations */ void __init dm644x_init(void); void __init dm644x_init_asp(struct snd_platform_data *pdata); -int __init dm644x_init_video(struct vpfe_config *); +int __init dm644x_init_video(struct vpfe_config *, struct vpbe_config *); /* DM646x function declarations */ void __init dm646x_init(void); |
