On Thursday 11 June 2009 19:00:47 [email protected] wrote:
> From: Muralidharan Karicheri <[email protected]>
>
> DM644x platform and board setup
>
> This adds plarform and board setup changes required to support
> vpfe capture driver on DM644x
>
> Added registration of vpss platform driver based on last comment
>
> Reviewed By "Hans Verkuil".
> Reviewed By "Laurent Pinchart".
>
> Signed-off-by: Muralidharan Karicheri <[email protected]>
> ---
> Applies to Davinci GIT Tree
>
> arch/arm/mach-davinci/board-dm644x-evm.c | 68
> ++++++++++++++++++++++++++-
> arch/arm/mach-davinci/dm644x.c | 56 ++++++++++++++++++++++
> arch/arm/mach-davinci/include/mach/dm644x.h | 2 +
> 3 files changed, 124 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c
> b/arch/arm/mach-davinci/board-dm644x-evm.c
> index d9d4045..13b73a7 100644
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -28,7 +28,8 @@
> #include <linux/io.h>
> #include <linux/phy.h>
> #include <linux/clk.h>
> -
> +#include <linux/videodev2.h>
> +#include <media/tvp514x.h>
> #include <asm/setup.h>
> #include <asm/mach-types.h>
>
> @@ -195,6 +196,57 @@ static struct platform_device davinci_fb_device = {
> .num_resources = 0,
> };
>
> +#define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL)
> +/* Inputs available at the TVP5146 */
> +static struct v4l2_input tvp5146_inputs[] = {
> + {
> + .index = 0,
> + .name = "COMPOSITE",
> + .type = V4L2_INPUT_TYPE_CAMERA,
> + .std = TVP514X_STD_ALL,
> + },
> + {
> + .index = 1,
> + .name = "SVIDEO",
> + .type = V4L2_INPUT_TYPE_CAMERA,
> + .std = TVP514X_STD_ALL,
> + },
No all-caps.
> +};
> +
> +/*
> + * this is the route info for connecting each input to decoder
> + * ouput that goes to vpfe. There is a one to one correspondence
> + * with tvp5146_inputs
> + */
> +static struct v4l2_routing tvp5146_routes[] = {
> + {
> + .input = INPUT_CVBS_VI2B,
> + .output = OUTPUT_10BIT_422_EMBEDDED_SYNC,
> + },
> + {
> + .input = INPUT_SVIDEO_VI2C_VI1C,
> + .output = OUTPUT_10BIT_422_EMBEDDED_SYNC,
> + },
> +};
> +
> +static struct vpfe_subdev_info vpfe_sub_devs[] = {
> + {
> + .name = "tvp5146",
> + .grp_id = 0,
> + .num_inputs = ARRAY_SIZE(tvp5146_inputs),
> + .inputs = tvp5146_inputs,
> + .routes = tvp5146_routes,
> + .can_route = 1,
> + },
> +};
Same remark as for patch 7: suggest using a separate input array.
Regards,
Hans
--
Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
