Commit 0c5dfa51 authored by Sekhar Nori's avatar Sekhar Nori Committed by Greg Kroah-Hartman

ARM: davinci: board-dm646x-evm: set VPIF capture card name

[ Upstream commit bb7298a7 ]

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: 85609c1c ("DaVinci: DM646x - platform changes for vpif capture and display drivers")
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb6b0d69
...@@ -539,7 +539,7 @@ static struct vpif_display_config dm646x_vpif_display_config = { ...@@ -539,7 +539,7 @@ static struct vpif_display_config dm646x_vpif_display_config = {
.outputs = dm6467_ch0_outputs, .outputs = dm6467_ch0_outputs,
.output_count = ARRAY_SIZE(dm6467_ch0_outputs), .output_count = ARRAY_SIZE(dm6467_ch0_outputs),
}, },
.card_name = "DM646x EVM", .card_name = "DM646x EVM Video Display",
}; };
/** /**
...@@ -698,6 +698,7 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { ...@@ -698,6 +698,7 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = {
.fid_pol = 0, .fid_pol = 0,
}, },
}, },
.card_name = "DM646x EVM Video Capture",
}; };
static void __init evm_init_video(void) static void __init evm_init_video(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment