[PATCH 1/2] Added video data to support tvout on rx51

[PATCH 1/2] Added video data to support tvout on rx51

[Srikar]

To support tvout on rx51,added Intilization data,
tvout as display device and enabled venc through gpio
on rx51

Signed-off-by: Srikar <ext-srikar.1.bhavanarayana@nokia.com>
---
 arch/arm/mach-omap2/board-rx51-video.c |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 85503fe..9919581 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -14,7 +14,6 @@
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/mm.h>
-
 #include <asm/mach-types.h>
 #include <plat/display.h>
 #include <plat/vram.h>
@@ -25,6 +24,9 @@
 #include "mux.h"
 
 #define RX51_LCD_RESET_GPIO	90
+/* REVISIT  to verify with rx51.c at sound/soc/omap */
+#define RX51_TVOUT_SEL_GPIO	40
+
 
 #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
 
@@ -39,6 +41,17 @@ static void rx51_lcd_disable(struct omap_dss_device *dssdev)
 	gpio_set_value(dssdev->reset_gpio, 0);
 }
 
+static int rx51_tvout_enable(struct omap_dss_device *dssdev)
+{
+	gpio_set_value(dssdev->reset_gpio, 1);
+	return 0;
+}
+
+static void rx51_tvout_disable(struct omap_dss_device *dssdev)
+{
+	gpio_set_value(dssdev->reset_gpio, 0);
+}
+
 static struct omap_dss_device rx51_lcd_device = {
 	.name			= "lcd",
 	.driver_name		= "panel-acx565akm",
@@ -49,8 +62,19 @@ static struct omap_dss_device rx51_lcd_device = {
 	.platform_disable	= rx51_lcd_disable,
 };
 
+static struct omap_dss_device  rx51_tv_device = {
+	.name			= "tv",
+	.type			= OMAP_DISPLAY_TYPE_VENC,
+	.driver_name		= "venc",
+	.phy.venc.type	        = OMAP_DSS_VENC_TYPE_COMPOSITE,
+	.reset_gpio	        = RX51_TVOUT_SEL_GPIO,
+	.platform_enable        = rx51_tvout_enable,
+	.platform_disable       = rx51_tvout_disable,
+};
+
 static struct omap_dss_device *rx51_dss_devices[] = {
 	&rx51_lcd_device,
+	&rx51_tv_device,
 };
 
 static struct omap_dss_board_info rx51_dss_board_info = {
@@ -88,6 +112,9 @@ static int __init rx51_video_init(void)
 
 	gpio_direction_output(RX51_LCD_RESET_GPIO, 1);
 
+	/* REVISIT  to verify with rx51.c at sound/soc/omap */
+	gpio_direction_output(RX51_TVOUT_SEL_GPIO, 1);
+
 	platform_add_devices(rx51_video_devices,
 				ARRAY_SIZE(rx51_video_devices));
 	return 0;
-- 
1.7.1

[PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[Srikar]

To support tvout on rx51,added the venc vdac regulator
consumer supply data  and also intialised the vdac regulator
with vdac regulator consumer supply data which enables the
power supply to venc through twl4030 on rx51

Signed-off-by: Srikar <ext-srikar.1.bhavanarayana@nokia.com>
---
 arch/arm/mach-omap2/board-rx51-peripherals.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index e56d6d7..ec47402 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -372,6 +372,16 @@ static struct regulator_consumer_supply rx51_vaux1_consumers[] = {
 #endif
 };
 
+static struct regulator_consumer_supply rx51_vdac_supply[] = {
+	{
+#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+		.supply	= "vdda_dac",
+		.dev	= &rx51_display_device.dev,
+	},
+#endif
+};
+
+
 static struct regulator_init_data rx51_vaux1 = {
 	.constraints = {
 		.name			= "V28",
@@ -489,14 +499,17 @@ static struct regulator_init_data rx51_vsim = {
 
 static struct regulator_init_data rx51_vdac = {
 	.constraints = {
+		.name			= "VDAC",
 		.min_uV			= 1800000,
 		.max_uV			= 1800000,
+		.apply_uV		= true,
 		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 					| REGULATOR_MODE_STANDBY,
-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
-					| REGULATOR_CHANGE_MODE
+		.valid_ops_mask		= REGULATOR_CHANGE_MODE
 					| REGULATOR_CHANGE_STATUS,
 	},
+	.num_consumer_supplies	= 1,
+	.consumer_supplies	= &rx51_vdac_supply,
 };
 
 static struct regulator_init_data rx51_vio = {
-- 
1.7.1

Re: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[Mark Brown]

On Thu, Nov 25, 2010 at 05:52:23PM +0200, Srikar wrote:

> +static struct regulator_consumer_supply rx51_vdac_supply[] = {
> +	{
> +#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)

The ifdefs here aren't really saving much...

> +		.supply	= "vdda_dac",
> +		.dev	= &rx51_display_device.dev,

dev_name is preferred, though I'm not sure if we'll ever get round to
phasing out plain dev.

RE: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[ext-srikar.1.bhavanarayana]

> +#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)

The ifdefs here aren't really saving much...
>>> In the same file board-rx51-peripheral.c,Under these  rx51_display_device is
defined  as extern  and also in board-rx51-video.c the under same #defines Complete display functionality is implemented
currently so used  not to break compilation when #defines are not enabled .

>>.dev_name is preferred, though I'm not sure if we'll ever get round to
phasing out plain dev.
>>>>It is difficult to modify currently.

________________________________________
From: ext Mark Brown [broonie@opensource.wolfsonmicro.com]
Sent: Thursday, November 25, 2010 6:11 PM
To: Bhavanarayana Srikar.1 (EXT-Elektrobit/Helsinki)
Cc: tony@atomide.com; linux@arm.linux.org.uk; linux-omap@vger.kernel.org
Subject: Re: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

On Thu, Nov 25, 2010 at 05:52:23PM +0200, Srikar wrote:

> +static struct regulator_consumer_supply rx51_vdac_supply[] = {
> +     {
> +#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)

The ifdefs here aren't really saving much...

> +             .supply = "vdda_dac",
> +             .dev    = &rx51_display_device.dev,

dev_name is preferred, though I'm not sure if we'll ever get round to
phasing out plain dev.

Re: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[Srikar]

On 11/25/2010 06:11 PM, ext Mark Brown wrote:
> On Thu, Nov 25, 2010 at 05:52:23PM +0200, Srikar wrote:
>
>> +static struct regulator_consumer_supply rx51_vdac_supply[] = {
>> +	{
>> +#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
> The ifdefs here aren't really saving much...
Currently rx51_display_device is defined under same
ifdefs(CONFIG_FB_OMAP2,CONFIG_FB_OMAP2_MODULE)
 as extern and also in board-rx51-video.c display devices are under same
ifdefs,So used to  not
break compilation when CONFIG_FB_OMAP2,CONFIG_FB_OMAP2_MODULE not defined.
>> +		.supply	= "vdda_dac",
>> +		.dev	= &rx51_display_device.dev,
> dev_name is preferred, though I'm not sure if we'll ever get round to
> phasing out plain dev.
Currently difficult to use .dev_name .

Re: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[Mark Brown]

On Fri, Nov 26, 2010 at 11:56:35AM +0200, Srikar wrote:
> On 11/25/2010 06:11 PM, ext Mark Brown wrote:
> > On Thu, Nov 25, 2010 at 05:52:23PM +0200, Srikar wrote:
> >
> >> +static struct regulator_consumer_supply rx51_vdac_supply[] = {
> >> +	{
> >> +#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
> > The ifdefs here aren't really saving much...

> Currently rx51_display_device is defined under same
> ifdefs(CONFIG_FB_OMAP2,CONFIG_FB_OMAP2_MODULE)
>  as extern and also in board-rx51-video.c display devices are under same
> ifdefs,So used to  not
> break compilation when CONFIG_FB_OMAP2,CONFIG_FB_OMAP2_MODULE not defined.

If you convert to usign dev_name as is better practice anyway this
won't be an issue.

> >> +		.supply	= "vdda_dac",
> >> +		.dev	= &rx51_display_device.dev,
> > dev_name is preferred, though I'm not sure if we'll ever get round to
> > phasing out plain dev.

> Currently difficult to use .dev_name .

because...

Re: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[Tony Lindgren]

* Mark Brown <broonie@opensource.wolfsonmicro.com> [101126 04:50]:
> On Fri, Nov 26, 2010 at 11:56:35AM +0200, Srikar wrote:
> > On 11/25/2010 06:11 PM, ext Mark Brown wrote:
> > > On Thu, Nov 25, 2010 at 05:52:23PM +0200, Srikar wrote:
> > >
> > >> +static struct regulator_consumer_supply rx51_vdac_supply[] = {
> > >> +	{
> > >> +#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
> > > The ifdefs here aren't really saving much...

By the way, all the board specific data should be __initdata eventually.
Now we're hogging memory for the regulators for all the boards compiled in..

Regards,

Tony

Re: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[Mark Brown]

On Fri, Nov 26, 2010 at 09:45:17AM -0800, Tony Lindgren wrote:

> By the way, all the board specific data should be __initdata eventually.
> Now we're hogging memory for the regulators for all the boards compiled in..

Yeah.  Some of it will need to be __devinitdata for hotpluggable things
but most of it should be __initdata.  I'll update the regulator API to
copy the constraints before the next merge window.

Re: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[Tony Lindgren]

* Mark Brown <broonie@opensource.wolfsonmicro.com> [101127 02:10]:
> On Fri, Nov 26, 2010 at 09:45:17AM -0800, Tony Lindgren wrote:
> 
> > By the way, all the board specific data should be __initdata eventually.
> > Now we're hogging memory for the regulators for all the boards compiled in..
> 
> Yeah.  Some of it will need to be __devinitdata for hotpluggable things
> but most of it should be __initdata.  I'll update the regulator API to
> copy the constraints before the next merge window.

OK sounds good to me.

Tony

Re: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[Mark Brown]

On Mon, Nov 29, 2010 at 10:18:31AM -0800, Tony Lindgren wrote:
> * Mark Brown <broonie@opensource.wolfsonmicro.com> [101127 02:10]:

> > Yeah.  Some of it will need to be __devinitdata for hotpluggable things
> > but most of it should be __initdata.  I'll update the regulator API to
> > copy the constraints before the next merge window.

> OK sounds good to me.

FWIW the patch is "regulator: Copy constraints from regulators when
initialising them", posted for review today.

Re: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[Tony Lindgren]

* Mark Brown <broonie@opensource.wolfsonmicro.com> [101129 10:27]:
> On Mon, Nov 29, 2010 at 10:18:31AM -0800, Tony Lindgren wrote:
> > * Mark Brown <broonie@opensource.wolfsonmicro.com> [101127 02:10]:
> 
> > > Yeah.  Some of it will need to be __devinitdata for hotpluggable things
> > > but most of it should be __initdata.  I'll update the regulator API to
> > > copy the constraints before the next merge window.
> 
> > OK sounds good to me.
> 
> FWIW the patch is "regulator: Copy constraints from regulators when
> initialising them", posted for review today.

Great, once that merges we'll start checking what can be __init or
__init_or_module for the omap board-*.c files.

Tony

Re: [PATCH 2/2] enabled vdda_dac regulator support tvout on rx51

[Srikar]

Updated version of patch of this is available at

https://patchwork.kernel.org/patch/424731/



On 11/30/2010 07:39 PM, ext Tony Lindgren wrote:
> * Mark Brown <broonie@opensource.wolfsonmicro.com> [101129 10:27]:
>> On Mon, Nov 29, 2010 at 10:18:31AM -0800, Tony Lindgren wrote:
>>> * Mark Brown <broonie@opensource.wolfsonmicro.com> [101127 02:10]:
>>>> Yeah.  Some of it will need to be __devinitdata for hotpluggable things
>>>> but most of it should be __initdata.  I'll update the regulator API to
>>>> copy the constraints before the next merge window.
>>> OK sounds good to me.
>> FWIW the patch is "regulator: Copy constraints from regulators when
>> initialising them", posted for review today.
> Great, once that merges we'll start checking what can be __init or
> __init_or_module for the omap board-*.c files.
>
> Tony

Re: [PATCH 1/2] Added video data to support tvout on rx51

[Tony Lindgren]

* Srikar <ext-srikar.1.bhavanarayana@nokia.com> [101125 07:43]:
> To support tvout on rx51,added Intilization data,
> tvout as display device and enabled venc through gpio
> on rx51

Only taking the first one, looks like the second one
has some pending comments.

Regards,

Tony