| From: Sekhar Nori <nsekhar@ti.com> |
| Date: Fri, 11 May 2018 20:51:36 +0530 |
| Subject: ARM: davinci: board-dm646x-evm: set VPIF capture card name |
| |
| commit bb7298a7e87cf3430eb62be8746e5d7a07ca9d7c upstream. |
| |
| 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> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/arm/mach-davinci/board-dm646x-evm.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/arch/arm/mach-davinci/board-dm646x-evm.c |
| +++ b/arch/arm/mach-davinci/board-dm646x-evm.c |
| @@ -541,7 +541,7 @@ static struct vpif_display_config dm646x |
| .outputs = dm6467_ch0_outputs, |
| .output_count = ARRAY_SIZE(dm6467_ch0_outputs), |
| }, |
| - .card_name = "DM646x EVM", |
| + .card_name = "DM646x EVM Video Display", |
| }; |
| |
| /** |
| @@ -699,6 +699,7 @@ static struct vpif_capture_config dm646x |
| .fid_pol = 0, |
| }, |
| }, |
| + .card_name = "DM646x EVM Video Capture", |
| }; |
| |
| static void __init evm_init_video(void) |
