[media] ARM: daVinci: dm644x/dm355/dm365: replace V4L2_STD_525_60/625_50 with V4L2_ST...

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>

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 104350600b20afc01db8a952d91ba8b044732abf..886481c12173c7d8edbf974eebde08ad6fe4c2cf 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -247,7 +247,7 @@ static struct vpbe_enc_mode_info dm355evm_enc_preset_timing[] = {
        {
                .name           = "ntsc",
                .timings_type   = VPBE_ENC_STD,
-               .std_id         = V4L2_STD_525_60,
+               .std_id         = V4L2_STD_NTSC,
                .interlaced     = 1,
                .xres           = 720,
                .yres           = 480,
@@ -259,7 +259,7 @@ static struct vpbe_enc_mode_info dm355evm_enc_preset_timing[] = {
        {
                .name           = "pal",
                .timings_type   = VPBE_ENC_STD,
-               .std_id         = V4L2_STD_625_50,
+               .std_id         = V4L2_STD_PAL,
                .interlaced     = 1,
                .xres           = 720,
                .yres           = 576,

diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 0518ce5753fe3720be1b901581e9c4e1f0e1f6b7..2a6674356585f47ea4e2cc8e38d582589d045e02 100644 (file)
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -381,7 +381,7 @@ static struct vpbe_enc_mode_info dm365evm_enc_std_timing[] = {
        {
                .name           = "ntsc",
                .timings_type   = VPBE_ENC_STD,
-               .std_id         = V4L2_STD_525_60,
+               .std_id         = V4L2_STD_NTSC,
                .interlaced     = 1,
                .xres           = 720,
                .yres           = 480,
@@ -393,7 +393,7 @@ static struct vpbe_enc_mode_info dm365evm_enc_std_timing[] = {
        {
                .name           = "pal",
                .timings_type   = VPBE_ENC_STD,
-               .std_id         = V4L2_STD_625_50,
+               .std_id         = V4L2_STD_PAL,
                .interlaced     = 1,
                .xres           = 720,
                .yres           = 576,

diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index a02180052a761cef0b871c402829024284791adc..745280d4144ca7b447ec0c614cc766777fefd9cc 100644 (file)
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -622,7 +622,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
        {
                .name           = "ntsc",
                .timings_type   = VPBE_ENC_STD,
-               .std_id         = V4L2_STD_525_60,
+               .std_id         = V4L2_STD_NTSC,
                .interlaced     = 1,
                .xres           = 720,
                .yres           = 480,
@@ -634,7 +634,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
        {
                .name           = "pal",
                .timings_type   = VPBE_ENC_STD,
-               .std_id         = V4L2_STD_625_50,
+               .std_id         = V4L2_STD_PAL,
                .interlaced     = 1,
                .xres           = 720,
                .yres           = 576,