diff options
author | Vaibhav Hiremath <hvaibhav@ti.com> | 2010-05-10 17:29:14 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-05-10 17:29:14 -0400 |
commit | b227358d333426abe47211b5be1fb69c0f74955f (patch) | |
tree | 51fea495704fb96d491c0fab13b5d29249847cb8 /arch/arm/mach-omap2/devices.c | |
parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) |
OMAP2/3: Add V4L2 DSS driver support in device.c
Add V4L2 DSS driver support in device.c
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 2271b9bd1f50..10f3a3c58cc0 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -786,6 +786,33 @@ static inline void omap_hdq_init(void) | |||
786 | static inline void omap_hdq_init(void) {} | 786 | static inline void omap_hdq_init(void) {} |
787 | #endif | 787 | #endif |
788 | 788 | ||
789 | /*---------------------------------------------------------------------------*/ | ||
790 | |||
791 | #if defined(CONFIG_VIDEO_OMAP2_VOUT) || \ | ||
792 | defined(CONFIG_VIDEO_OMAP2_VOUT_MODULE) | ||
793 | #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) | ||
794 | static struct resource omap_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = { | ||
795 | }; | ||
796 | #else | ||
797 | static struct resource omap_vout_resource[2] = { | ||
798 | }; | ||
799 | #endif | ||
800 | |||
801 | static struct platform_device omap_vout_device = { | ||
802 | .name = "omap_vout", | ||
803 | .num_resources = ARRAY_SIZE(omap_vout_resource), | ||
804 | .resource = &omap_vout_resource[0], | ||
805 | .id = -1, | ||
806 | }; | ||
807 | static void omap_init_vout(void) | ||
808 | { | ||
809 | if (platform_device_register(&omap_vout_device) < 0) | ||
810 | printk(KERN_ERR "Unable to register OMAP-VOUT device\n"); | ||
811 | } | ||
812 | #else | ||
813 | static inline void omap_init_vout(void) {} | ||
814 | #endif | ||
815 | |||
789 | /*-------------------------------------------------------------------------*/ | 816 | /*-------------------------------------------------------------------------*/ |
790 | 817 | ||
791 | static int __init omap2_init_devices(void) | 818 | static int __init omap2_init_devices(void) |
@@ -800,6 +827,7 @@ static int __init omap2_init_devices(void) | |||
800 | omap_hdq_init(); | 827 | omap_hdq_init(); |
801 | omap_init_sti(); | 828 | omap_init_sti(); |
802 | omap_init_sha1_md5(); | 829 | omap_init_sha1_md5(); |
830 | omap_init_vout(); | ||
803 | 831 | ||
804 | return 0; | 832 | return 0; |
805 | } | 833 | } |