diff options
author | Lad, Prabhakar <prabhakar.csengg@gmail.com> | 2013-04-12 06:46:19 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-14 19:10:59 -0400 |
commit | 89cdbba84157a41404ee2de30142d839596eece9 (patch) | |
tree | 4656c790a3478b9018f102fabdb5a3927680dac9 /arch/arm | |
parent | 8775617701868d590d8e6069d9d64bfab0ea3db5 (diff) |
[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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-davinci/board-dm355-evm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm365-evm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm644x-evm.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 104350600b20..886481c12173 100644 --- 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[] = { | |||
247 | { | 247 | { |
248 | .name = "ntsc", | 248 | .name = "ntsc", |
249 | .timings_type = VPBE_ENC_STD, | 249 | .timings_type = VPBE_ENC_STD, |
250 | .std_id = V4L2_STD_525_60, | 250 | .std_id = V4L2_STD_NTSC, |
251 | .interlaced = 1, | 251 | .interlaced = 1, |
252 | .xres = 720, | 252 | .xres = 720, |
253 | .yres = 480, | 253 | .yres = 480, |
@@ -259,7 +259,7 @@ static struct vpbe_enc_mode_info dm355evm_enc_preset_timing[] = { | |||
259 | { | 259 | { |
260 | .name = "pal", | 260 | .name = "pal", |
261 | .timings_type = VPBE_ENC_STD, | 261 | .timings_type = VPBE_ENC_STD, |
262 | .std_id = V4L2_STD_625_50, | 262 | .std_id = V4L2_STD_PAL, |
263 | .interlaced = 1, | 263 | .interlaced = 1, |
264 | .xres = 720, | 264 | .xres = 720, |
265 | .yres = 576, | 265 | .yres = 576, |
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index 0518ce5753fe..2a6674356585 100644 --- 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[] = { | |||
381 | { | 381 | { |
382 | .name = "ntsc", | 382 | .name = "ntsc", |
383 | .timings_type = VPBE_ENC_STD, | 383 | .timings_type = VPBE_ENC_STD, |
384 | .std_id = V4L2_STD_525_60, | 384 | .std_id = V4L2_STD_NTSC, |
385 | .interlaced = 1, | 385 | .interlaced = 1, |
386 | .xres = 720, | 386 | .xres = 720, |
387 | .yres = 480, | 387 | .yres = 480, |
@@ -393,7 +393,7 @@ static struct vpbe_enc_mode_info dm365evm_enc_std_timing[] = { | |||
393 | { | 393 | { |
394 | .name = "pal", | 394 | .name = "pal", |
395 | .timings_type = VPBE_ENC_STD, | 395 | .timings_type = VPBE_ENC_STD, |
396 | .std_id = V4L2_STD_625_50, | 396 | .std_id = V4L2_STD_PAL, |
397 | .interlaced = 1, | 397 | .interlaced = 1, |
398 | .xres = 720, | 398 | .xres = 720, |
399 | .yres = 576, | 399 | .yres = 576, |
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index a02180052a76..745280d4144c 100644 --- 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[] = { | |||
622 | { | 622 | { |
623 | .name = "ntsc", | 623 | .name = "ntsc", |
624 | .timings_type = VPBE_ENC_STD, | 624 | .timings_type = VPBE_ENC_STD, |
625 | .std_id = V4L2_STD_525_60, | 625 | .std_id = V4L2_STD_NTSC, |
626 | .interlaced = 1, | 626 | .interlaced = 1, |
627 | .xres = 720, | 627 | .xres = 720, |
628 | .yres = 480, | 628 | .yres = 480, |
@@ -634,7 +634,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = { | |||
634 | { | 634 | { |
635 | .name = "pal", | 635 | .name = "pal", |
636 | .timings_type = VPBE_ENC_STD, | 636 | .timings_type = VPBE_ENC_STD, |
637 | .std_id = V4L2_STD_625_50, | 637 | .std_id = V4L2_STD_PAL, |
638 | .interlaced = 1, | 638 | .interlaced = 1, |
639 | .xres = 720, | 639 | .xres = 720, |
640 | .yres = 576, | 640 | .yres = 576, |