[Resubmit: PATCH-V6 2/2] OMAP2/3: Add V4L2 DSS driver support in device.c
From: Vaibhav Hiremath hvaib...@ti.com Signed-off-by: Vaibhav Hiremath hvaib...@ti.com --- 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 18ad931..83c92cd 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -763,6 +763,33 @@ static inline void omap_hdq_init(void) static inline void omap_hdq_init(void) {} #endif +/*---*/ + +#if defined(CONFIG_VIDEO_OMAP2_VOUT) || \ + defined(CONFIG_VIDEO_OMAP2_VOUT_MODULE) +#if defined (CONFIG_FB_OMAP2) || defined (CONFIG_FB_OMAP2_MODULE) +static struct resource omap_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = { +}; +#else +static struct resource omap_vout_resource[2] = { +}; +#endif + +static struct platform_device omap_vout_device = { + .name = omap_vout, + .num_resources = ARRAY_SIZE(omap_vout_resource), + .resource = omap_vout_resource[0], + .id = -1, +}; +static void omap_init_vout(void) +{ + if (platform_device_register(omap_vout_device) 0) + printk(KERN_ERR Unable to register OMAP-VOUT device\n); +} +#else +static inline void omap_init_vout(void) {} +#endif + /*-*/ static int __init omap2_init_devices(void) @@ -777,6 +804,7 @@ static int __init omap2_init_devices(void) omap_hdq_init(); omap_init_sti(); omap_init_sha1_md5(); + omap_init_vout(); return 0; } -- 1.6.2.4 -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH-V6 2/2] OMAP2/3: Add V4L2 DSS driver support in device.c
* hvaib...@ti.com hvaib...@ti.com [100223 01:25]: From: Vaibhav Hiremath hvaib...@ti.com Signed-off-by: Vaibhav Hiremath hvaib...@ti.com --- arch/arm/plat-omap/devices.c | 29 + 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 30b5db7..64f2a3a 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -357,6 +357,34 @@ static void omap_init_wdt(void) static inline void omap_init_wdt(void) {} #endif +/*---*/ + +#if defined(CONFIG_VIDEO_OMAP2_VOUT) || \ + defined(CONFIG_VIDEO_OMAP2_VOUT_MODULE) +#if defined (CONFIG_FB_OMAP2) || defined (CONFIG_FB_OMAP2_MODULE) +static struct resource omap_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = { +}; +#else +static struct resource omap_vout_resource[2] = { +}; +#endif + +static struct platform_device omap_vout_device = { + .name = omap_vout, + .num_resources = ARRAY_SIZE(omap_vout_resource), + .resource = omap_vout_resource[0], + .id = -1, +}; +static void omap_init_vout(void) +{ + (void) platform_device_register(omap_vout_device); +} Allocation can still fail here, please handle the results. +#else +static inline void omap_init_vout(void) {} +#endif + +/*---*/ + /* * This gets called after board-specific INIT_MACHINE, and initializes most * on-chip peripherals accessible on this board (except for few like USB): @@ -387,6 +415,7 @@ static int __init omap_init_devices(void) omap_init_rng(); omap_init_uwire(); omap_init_wdt(); + omap_init_vout(); return 0; } arch_initcall(omap_init_devices); Looks like this should be in mach-omap2/devices.c instead if it's all omap2/3/4 specific. Regards, Tony -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH-V6 2/2] OMAP2/3: Add V4L2 DSS driver support in device.c
-Original Message- From: Tony Lindgren [mailto:t...@atomide.com] Sent: Friday, February 26, 2010 3:44 AM To: Hiremath, Vaibhav Cc: linux-media@vger.kernel.org; linux-o...@vger.kernel.org; hverk...@xs4all.nl Subject: Re: [PATCH-V6 2/2] OMAP2/3: Add V4L2 DSS driver support in device.c * hvaib...@ti.com hvaib...@ti.com [100223 01:25]: From: Vaibhav Hiremath hvaib...@ti.com Signed-off-by: Vaibhav Hiremath hvaib...@ti.com --- arch/arm/plat-omap/devices.c | 29 + 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 30b5db7..64f2a3a 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -357,6 +357,34 @@ static void omap_init_wdt(void) static inline void omap_init_wdt(void) {} #endif +/*--- */ + +#if defined(CONFIG_VIDEO_OMAP2_VOUT) || \ + defined(CONFIG_VIDEO_OMAP2_VOUT_MODULE) +#if defined (CONFIG_FB_OMAP2) || defined (CONFIG_FB_OMAP2_MODULE) +static struct resource omap_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = { +}; +#else +static struct resource omap_vout_resource[2] = { +}; +#endif + +static struct platform_device omap_vout_device = { + .name = omap_vout, + .num_resources = ARRAY_SIZE(omap_vout_resource), + .resource = omap_vout_resource[0], + .id = -1, +}; +static void omap_init_vout(void) +{ + (void) platform_device_register(omap_vout_device); +} Allocation can still fail here, please handle the results. [Hiremath, Vaibhav] Ok, will do that. +#else +static inline void omap_init_vout(void) {} +#endif + +/*--- */ + /* * This gets called after board-specific INIT_MACHINE, and initializes most * on-chip peripherals accessible on this board (except for few like USB): @@ -387,6 +415,7 @@ static int __init omap_init_devices(void) omap_init_rng(); omap_init_uwire(); omap_init_wdt(); + omap_init_vout(); return 0; } arch_initcall(omap_init_devices); Looks like this should be in mach-omap2/devices.c instead if it's all omap2/3/4 specific. [Hiremath, Vaibhav] For sure it's being used for OMAP2/3 and if I understand correctly OMAP4 also uses it. Thanks, Vaibhav Regards, Tony -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH-V6 2/2] OMAP2/3: Add V4L2 DSS driver support in device.c
From: Vaibhav Hiremath hvaib...@ti.com Signed-off-by: Vaibhav Hiremath hvaib...@ti.com --- arch/arm/plat-omap/devices.c | 29 + 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 30b5db7..64f2a3a 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -357,6 +357,34 @@ static void omap_init_wdt(void) static inline void omap_init_wdt(void) {} #endif +/*---*/ + +#if defined(CONFIG_VIDEO_OMAP2_VOUT) || \ + defined(CONFIG_VIDEO_OMAP2_VOUT_MODULE) +#if defined (CONFIG_FB_OMAP2) || defined (CONFIG_FB_OMAP2_MODULE) +static struct resource omap_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = { +}; +#else +static struct resource omap_vout_resource[2] = { +}; +#endif + +static struct platform_device omap_vout_device = { + .name = omap_vout, + .num_resources = ARRAY_SIZE(omap_vout_resource), + .resource = omap_vout_resource[0], + .id = -1, +}; +static void omap_init_vout(void) +{ + (void) platform_device_register(omap_vout_device); +} +#else +static inline void omap_init_vout(void) {} +#endif + +/*---*/ + /* * This gets called after board-specific INIT_MACHINE, and initializes most * on-chip peripherals accessible on this board (except for few like USB): @@ -387,6 +415,7 @@ static int __init omap_init_devices(void) omap_init_rng(); omap_init_uwire(); omap_init_wdt(); + omap_init_vout(); return 0; } arch_initcall(omap_init_devices); -- 1.6.2.4 -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html