summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSekhar Nori <nsekhar@ti.com>2018-05-11 20:51:36 +0530
committerSekhar Nori <nsekhar@ti.com>2018-05-15 14:31:12 +0530
commitbb7298a7e87cf3430eb62be8746e5d7a07ca9d7c (patch)
tree80ac83324a16753e3f6f440b94647c3e3913ffea /arch
parent7d46899d57f8b61eb28701d9a4043b71e3392c26 (diff)
downloadlinux-bb7298a7e87cf3430eb62be8746e5d7a07ca9d7c.tar.bz2
ARM: davinci: board-dm646x-evm: set VPIF capture card name
VPIF capture driver expects card name to be set since it uses it without checking for NULL. The commit which introduced VPIF display and capture support added card name only for display, not for capture. Set it in platform data to probe driver successfully. While at it, also fix the display card name to something more appropriate. Fixes: 85609c1ccda6 ("DaVinci: DM646x - platform changes for vpif capture and display drivers") Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-davinci/board-dm646x-evm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 8c28fa7157e0..a3c0d1e87647 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -537,7 +537,7 @@ static struct vpif_display_config dm646x_vpif_display_config = {
.outputs = dm6467_ch0_outputs,
.output_count = ARRAY_SIZE(dm6467_ch0_outputs),
},
- .card_name = "DM646x EVM",
+ .card_name = "DM646x EVM Video Display",
};
/**
@@ -696,6 +696,7 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = {
.fid_pol = 0,
},
},
+ .card_name = "DM646x EVM Video Capture",
};
static void __init evm_init_video(void)