Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89cdbba8 authored Apr 12, 2013 by Lad, Prabhakar Committed by Mauro Carvalho Chehab Apr 14, 2013

[media] ARM: daVinci: dm644x/dm355/dm365: replace V4L2_STD_525_60/625_50 with V4L2_STD_NTSC/PAL



This patch replaces V4L2_STD_525_60/625_50 with V4L2_STD_NTSC/PAL
respectively as this are the proper video standards.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Reported-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 87756177

arch/arm/mach-davinci/board-dm355-evm.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -247,7 +247,7 @@ static struct vpbe_enc_mode_info dm355evm_enc_preset_timing[] = {
	{		{
	.name = "ntsc",		.name = "ntsc",
	.timings_type = VPBE_ENC_STD,		.timings_type = VPBE_ENC_STD,
	.std_id = V4L2_STD_525_60,		.std_id = V4L2_STD_NTSC,
	.interlaced = 1,		.interlaced = 1,
	.xres = 720,		.xres = 720,
	.yres = 480,		.yres = 480,
	@@ -259,7 +259,7 @@ static struct vpbe_enc_mode_info dm355evm_enc_preset_timing[] = {
	{		{
	.name = "pal",		.name = "pal",
	.timings_type = VPBE_ENC_STD,		.timings_type = VPBE_ENC_STD,
	.std_id = V4L2_STD_625_50,		.std_id = V4L2_STD_PAL,
	.interlaced = 1,		.interlaced = 1,
	.xres = 720,		.xres = 720,
	.yres = 576,		.yres = 576,

arch/arm/mach-davinci/board-dm365-evm.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -381,7 +381,7 @@ static struct vpbe_enc_mode_info dm365evm_enc_std_timing[] = {
	{		{
	.name = "ntsc",		.name = "ntsc",
	.timings_type = VPBE_ENC_STD,		.timings_type = VPBE_ENC_STD,
	.std_id = V4L2_STD_525_60,		.std_id = V4L2_STD_NTSC,
	.interlaced = 1,		.interlaced = 1,
	.xres = 720,		.xres = 720,
	.yres = 480,		.yres = 480,
	@@ -393,7 +393,7 @@ static struct vpbe_enc_mode_info dm365evm_enc_std_timing[] = {
	{		{
	.name = "pal",		.name = "pal",
	.timings_type = VPBE_ENC_STD,		.timings_type = VPBE_ENC_STD,
	.std_id = V4L2_STD_625_50,		.std_id = V4L2_STD_PAL,
	.interlaced = 1,		.interlaced = 1,
	.xres = 720,		.xres = 720,
	.yres = 576,		.yres = 576,

arch/arm/mach-davinci/board-dm644x-evm.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -622,7 +622,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
	{		{
	.name = "ntsc",		.name = "ntsc",
	.timings_type = VPBE_ENC_STD,		.timings_type = VPBE_ENC_STD,
	.std_id = V4L2_STD_525_60,		.std_id = V4L2_STD_NTSC,
	.interlaced = 1,		.interlaced = 1,
	.xres = 720,		.xres = 720,
	.yres = 480,		.yres = 480,
	@@ -634,7 +634,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
	{		{
	.name = "pal",		.name = "pal",
	.timings_type = VPBE_ENC_STD,		.timings_type = VPBE_ENC_STD,
	.std_id = V4L2_STD_625_50,		.std_id = V4L2_STD_PAL,
	.interlaced = 1,		.interlaced = 1,
	.xres = 720,		.xres = 720,
	.yres = 576,		.yres = 576,