[PATCH] OMAP2: OMAPFB: Fix invalid bpp for PAL and NTSC modes

[Maurus Cuelenaere]

omapfb_mode_to_timings() sets the bpp to 0 when bootarg omapfb.mode is set to
either pal or ntsc. This patch corrects this by setting the bpp to 24, as
would be done if omapdss_default_get_recommended_bpp() would be called

Signed-off-by: Maurus Cuelenaere mcuelena...@gmail.com
---
 drivers/video/omap2/omapfb/omapfb-main.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c 
b/drivers/video/omap2/omapfb/omapfb-main.c
index 4b4506d..500458e 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1968,11 +1968,11 @@ static int omapfb_mode_to_timings(const char *mode_str,
 #ifdef CONFIG_OMAP2_DSS_VENC
if (strcmp(mode_str, pal) == 0) {
*timings = omap_dss_pal_timings;
-   *bpp = 0;
+   *bpp = 24;
return 0;
} else if (strcmp(mode_str, ntsc) == 0) {
*timings = omap_dss_ntsc_timings;
-   *bpp = 0;
+   *bpp = 24;
return 0;
}
 #endif
-- 
1.7.0.4

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

[PATCH] ARM: OMAP3: Add S-Video output to IGEPv2 board

[Maurus Cuelenaere]

This adds S-Video DSS and VDAC regulator platform definitions to the IGEPv2
board. There isn't a physical connector on-board but one can solder one at test
points provided by ISEE.

Signed-off-by: Maurus Cuelenaere mcuelena...@gmail.com
---
 arch/arm/mach-omap2/board-igep0020.c |   31 +--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/board-igep0020.c 
b/arch/arm/mach-omap2/board-igep0020.c
index d55c57b..3ec48bd 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -310,8 +310,16 @@ static struct omap_dss_device igep2_dvi_device = {
.platform_disable   = igep2_disable_dvi,
 };
 
+static struct omap_dss_device igep2_tv_device = {
+   .name   = tv,
+   .driver_name= venc,
+   .type   = OMAP_DISPLAY_TYPE_VENC,
+   .phy.venc.type  = OMAP_DSS_VENC_TYPE_SVIDEO,
+};
+
 static struct omap_dss_device *igep2_dss_devices[] = {
-   igep2_dvi_device
+   igep2_dvi_device,
+   igep2_tv_device,
 };
 
 static struct omap_dss_board_info igep2_dss_data = {
@@ -328,6 +336,25 @@ static struct platform_device igep2_dss_device = {
},
 };
 
+static struct regulator_consumer_supply igep2_vdda_dac_supply = {
+   .supply = vdda_dac,
+   .dev= igep2_dss_device.dev,
+};
+
+/* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */
+static struct regulator_init_data igep2_vdac = {
+   .constraints = {
+   .min_uV = 180,
+   .max_uV = 180,
+   .valid_modes_mask   = REGULATOR_MODE_NORMAL
+   | REGULATOR_MODE_STANDBY,
+   .valid_ops_mask = REGULATOR_CHANGE_MODE
+   | REGULATOR_CHANGE_STATUS,
+   },
+   .num_consumer_supplies  = 1,
+   .consumer_supplies  = igep2_vdda_dac_supply,
+};
+
 static struct regulator_consumer_supply igep2_vpll2_supply = {
.supply = vdds_dsi,
.dev= igep2_dss_device.dev,
@@ -429,7 +456,7 @@ static struct twl4030_platform_data igep2_twldata = {
.vmmc1  = igep2_vmmc1,
.vmmc2  = igep2_vmmc2,
.vpll2  = igep2_vpll2,
-
+   .vdac   = igep2_vdac,
 };
 
 static struct i2c_board_info __initdata igep2_i2c_boardinfo[] = {
-- 
1.7.0.4

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