[PATCH-V6,2/2] OMAP2/3: Add V4L2 DSS driver support in device.c

Message ID 1266917239-7094-3-git-send-email-hvaibhav@ti.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Hiremath, Vaibhav Feb. 23, 2010, 9:27 a.m. UTC
  From: Vaibhav Hiremath <hvaibhav@ti.com>


Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
 arch/arm/plat-omap/devices.c |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

--
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  

Comments

Tony Lindgren Feb. 25, 2010, 10:14 p.m. UTC | #1
* hvaibhav@ti.com <hvaibhav@ti.com> [100223 01:25]:
> From: Vaibhav Hiremath <hvaibhav@ti.com>
> 
> 
> Signed-off-by: Vaibhav Hiremath <hvaibhav@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 majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  
Hiremath, Vaibhav Feb. 26, 2010, 6:54 a.m. UTC | #2
> -----Original Message-----
> From: Tony Lindgren [mailto:tony@atomide.com]
> Sent: Friday, February 26, 2010 3:44 AM
> To: Hiremath, Vaibhav
> Cc: linux-media@vger.kernel.org; linux-omap@vger.kernel.org;
> hverkuil@xs4all.nl
> Subject: Re: [PATCH-V6 2/2] OMAP2/3: Add V4L2 DSS driver support in device.c
> 
> * hvaibhav@ti.com <hvaibhav@ti.com> [100223 01:25]:
> > From: Vaibhav Hiremath <hvaibhav@ti.com>
> >
> >
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@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 majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  

Patch

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);