diff mbox

Subject: [PATCH v3 1/4] ARM: DaVinci: DM646x Video: Platform and board specific setup

Message ID 1241789157-23350-1-git-send-email-chaithrika@ti.com (mailing list archive)
State RFC
Headers show

Commit Message

chaithrika@ti.com May 8, 2009, 1:25 p.m. UTC 
Platform specific display device setup for DM646x EVM

Add platform device and resource structures. Also define a platform specific
clock setup function that can be accessed by the driver to configure the clock
and CPLD.

This patch is dependent on a patch submitted earlier, which adds
Pin Mux and clock definitions for Video on DM646x.

Signed-off-by: Manjunath Hadli <mrh@ti.com>
Signed-off-by: Brijesh Jadav <brijesh.j@ti.com>
Signed-off-by: Chaithrika U S <chaithrika@ti.com>
---
Applies to Davinci GIT tree

 arch/arm/mach-davinci/board-dm646x-evm.c    |  122 +++++++++++++++++++++++++++
 arch/arm/mach-davinci/dm646x.c              |   63 ++++++++++++++
 arch/arm/mach-davinci/include/mach/dm646x.h |   25 ++++++
 3 files changed, 210 insertions(+), 0 deletions(-)

Comments

chaithrika@ti.com June 22, 2009, 8:14 a.m. UTC | #1 
Kevin,

I think this patch has to be taken into DaVinci tree so that it
can be submitted upstream. This patch has to be present in the Linux 
tree for Hans to prepare a pull request for DM646x display driver 
patches.

Regards,
Chaithrika

> -----Original Message-----
> From: linux-media-owner@vger.kernel.org [mailto:linux-media-
> owner@vger.kernel.org] On Behalf Of Chaithrika U S
> Sent: Friday, May 08, 2009 6:56 PM
> To: linux-media@vger.kernel.org
> Cc: davinci-linux-open-source@linux.davincidsp.com; Chaithrika U S;
> Manjunath Hadli; Brijesh Jadav
> Subject: [PATCH] Subject: [PATCH v3 1/4] ARM: DaVinci: DM646x Video:
> Platform and board specific setup
> 
> Platform specific display device setup for DM646x EVM
> 
> Add platform device and resource structures. Also define a platform
> specific
> clock setup function that can be accessed by the driver to configure
> the clock
> and CPLD.
> 
> This patch is dependent on a patch submitted earlier, which adds
> Pin Mux and clock definitions for Video on DM646x.
> 
> Signed-off-by: Manjunath Hadli <mrh@ti.com>
> Signed-off-by: Brijesh Jadav <brijesh.j@ti.com>
> Signed-off-by: Chaithrika U S <chaithrika@ti.com>
> ---
> Applies to Davinci GIT tree
> 
>  arch/arm/mach-davinci/board-dm646x-evm.c    |  122
> +++++++++++++++++++++++++++
>  arch/arm/mach-davinci/dm646x.c              |   63 ++++++++++++++
>  arch/arm/mach-davinci/include/mach/dm646x.h |   25 ++++++
>  3 files changed, 210 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-
> davinci/board-dm646x-evm.c
> index a55f45c..b64ae1c 100644
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -52,6 +52,19 @@
>  #define DM646X_EVM_PHY_MASK		(0x2)
>  #define DM646X_EVM_MDIO_FREQUENCY	(2200000) /* PHY bus frequency */
> 
> +#define VIDCLKCTL_OFFSET	(0x38)
> +#define VSCLKDIS_OFFSET		(0x6c)
> +
> +#define VCH2CLK_MASK		(BIT_MASK(10) | BIT_MASK(9) |
> BIT_MASK(8))
> +#define VCH2CLK_SYSCLK8		(BIT(9))
> +#define VCH2CLK_AUXCLK		(BIT(9) | BIT(8))
> +#define VCH3CLK_MASK		(BIT_MASK(14) | BIT_MASK(13) |
> BIT_MASK(12))
> +#define VCH3CLK_SYSCLK8		(BIT(13))
> +#define VCH3CLK_AUXCLK		(BIT(14) | BIT(13))
> +
> +#define VIDCH2CLK		(BIT(10))
> +#define VIDCH3CLK		(BIT(11))
> +
>  static struct davinci_uart_config uart_config __initdata = {
>  	.enabled_uarts = (1 << 0),
>  };
> @@ -206,6 +219,40 @@ static struct at24_platform_data eeprom_info = {
>  	.context	= (void *)0x7f00,
>  };
> 
> +static struct i2c_client *cpld_client;
> +
> +static int cpld_video_probe(struct i2c_client *client,
> +			const struct i2c_device_id *id)
> +{
> +	cpld_client = client;
> +	return 0;
> +}
> +
> +static int __devexit cpld_video_remove(struct i2c_client *client)
> +{
> +	cpld_client = NULL;
> +	return 0;
> +}
> +
> +static const struct i2c_device_id cpld_video_id[] = {
> +	{ "cpld_video", 0 },
> +	{ }
> +};
> +
> +static struct i2c_driver cpld_video_driver = {
> +	.driver = {
> +		.name	= "cpld_video",
> +	},
> +	.probe		= cpld_video_probe,
> +	.remove		= cpld_video_remove,
> +	.id_table	= cpld_video_id,
> +};
> +
> +static void evm_init_cpld(void)
> +{
> +	i2c_add_driver(&cpld_video_driver);
> +}
> +
>  static struct i2c_board_info __initdata i2c_info[] =  {
>  	{
>  		I2C_BOARD_INFO("24c256", 0x50),
> @@ -215,6 +262,9 @@ static struct i2c_board_info __initdata i2c_info[]
> =  {
>  		I2C_BOARD_INFO("pcf8574a", 0x38),
>  		.platform_data	= &pcf_data,
>  	},
> +	{
> +		I2C_BOARD_INFO("cpld_video", 0x3B),
> +	},
>  };
> 
>  static struct davinci_i2c_platform_data i2c_pdata = {
> @@ -222,10 +272,81 @@ static struct davinci_i2c_platform_data i2c_pdata
> = {
>  	.bus_delay      = 0 /* usec */,
>  };
> 
> +static int set_vpif_clock(int mux_mode, int hd)
> +{
> +	int val = 0;
> +	int err = 0;
> +	unsigned int value;
> +	void __iomem *base = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE);
> +
> +	/* disable the clock */
> +	value = __raw_readl(base + VSCLKDIS_OFFSET);
> +	value |= (VIDCH3CLK | VIDCH2CLK);
> +	__raw_writel(value, base + VSCLKDIS_OFFSET);
> +
> +	val = i2c_smbus_read_byte(cpld_client);
> +	if (val < 0)
> +		return val;
> +
> +	if (mux_mode == 1)
> +		val &= ~0x40;
> +	else
> +		val |= 0x40;
> +
> +	err = i2c_smbus_write_byte(cpld_client, val);
> +	if (err)
> +		return err;
> +
> +	value = __raw_readl(base + VIDCLKCTL_OFFSET);
> +	value &= ~(VCH2CLK_MASK);
> +	value &= ~(VCH3CLK_MASK);
> +
> +	if (hd >= 1)
> +		value |= (VCH2CLK_SYSCLK8 | VCH3CLK_SYSCLK8);
> +	else
> +		value |= (VCH2CLK_AUXCLK | VCH3CLK_AUXCLK);
> +
> +	__raw_writel(value, base + VIDCLKCTL_OFFSET);
> +
> +	/* enable the clock */
> +	value = __raw_readl(base + VSCLKDIS_OFFSET);
> +	value &= ~(VIDCH3CLK | VIDCH2CLK);
> +	__raw_writel(value, base + VSCLKDIS_OFFSET);
> +
> +	return 0;
> +}
> +
> +static const struct subdev_info dm646x_vpif_subdev[] = {
> +	{
> +		.addr	= 0x2A,
> +		.name	= "adv7343",
> +	},
> +	{
> +		.addr	= 0x2C,
> +		.name	= "ths7303",
> +	},
> +};
> +
> +static const char *output[] = {
> +	"Composite",
> +	"Component",
> +	"S-Video",
> +};
> +
> +static struct vpif_config dm646x_vpif_config = {
> +	.set_clock	= set_vpif_clock,
> +	.subdevinfo	= dm646x_vpif_subdev,
> +	.subdev_count	= ARRAY_SIZE(dm646x_vpif_subdev),
> +	.output		= output,
> +	.output_count	= ARRAY_SIZE(output),
> +	.card_name	= "DM646x EVM",
> +};
> +
>  static void __init evm_init_i2c(void)
>  {
>  	davinci_init_i2c(&i2c_pdata);
>  	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));
> +	evm_init_cpld();
>  }
> 
>  static void __init davinci_map_io(void)
> @@ -242,6 +363,7 @@ static __init void evm_init(void)
> 
>  	soc_info->emac_pdata->phy_mask = DM646X_EVM_PHY_MASK;
>  	soc_info->emac_pdata->mdio_max_freq = DM646X_EVM_MDIO_FREQUENCY;
> +	dm646x_setup_vpif(&dm646x_vpif_config);
>  }
> 
>  static __init void davinci_dm646x_evm_irq_init(void)
> diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-
> davinci/dm646x.c
> index 3cd09c1..94e17a3 100644
> --- a/arch/arm/mach-davinci/dm646x.c
> +++ b/arch/arm/mach-davinci/dm646x.c
> @@ -13,6 +13,7 @@
>  #include <linux/clk.h>
>  #include <linux/serial_8250.h>
>  #include <linux/platform_device.h>
> +#include <linux/dma-mapping.h>
> 
>  #include <asm/mach/map.h>
> 
> @@ -31,6 +32,15 @@
>  #include "clock.h"
>  #include "mux.h"
> 
> +#define DAVINCI_VPIF_BASE       (0x01C12000)
> +#define VDD3P3V_PWDN_OFFSET	(0x48)
> +#define VSCLKDIS_OFFSET		(0x6C)
> +
> +#define VDD3P3V_VID_MASK	(BIT_MASK(7) | BIT_MASK(6) | BIT_MASK(5)
> |\
> +					BIT_MASK(4))
> +#define VSCLKDIS_MASK		(BIT_MASK(11) | BIT_MASK(10) |
> BIT_MASK(9) |\
> +					BIT_MASK(8))
> +
>  /*
>   * Device specific clocks
>   */
> @@ -509,6 +519,37 @@ static struct platform_device dm646x_edma_device =
> {
>  	.resource		= edma_resources,
>  };
> 
> +static u64 vpif_dma_mask = DMA_32BIT_MASK;
> +
> +static struct resource vpif_resource[] = {
> +	{
> +		.start	= DAVINCI_VPIF_BASE,
> +		.end	= DAVINCI_VPIF_BASE + 0x03fff,
> +		.flags	= IORESOURCE_MEM,
> +	},
> +	{
> +		.start = IRQ_DM646X_VP_VERTINT2,
> +		.end   = IRQ_DM646X_VP_VERTINT2,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = IRQ_DM646X_VP_VERTINT3,
> +		.end   = IRQ_DM646X_VP_VERTINT3,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +};
> +
> +static struct platform_device vpif_display_dev = {
> +	.name		= "vpif_display",
> +	.id		= -1,
> +	.dev		= {
> +			.dma_mask 		= &vpif_dma_mask,
> +			.coherent_dma_mask	= DMA_32BIT_MASK,
> +	},
> +	.resource	= vpif_resource,
> +	.num_resources	= ARRAY_SIZE(vpif_resource),
> +};
> +
>  /*--------------------------------------------------------------------
> --*/
> 
>  static struct map_desc dm646x_io_desc[] = {
> @@ -619,6 +660,28 @@ static struct davinci_soc_info
> davinci_soc_info_dm646x = {
>  	.sram_len		= SZ_32K,
>  };
> 
> +void dm646x_setup_vpif(struct vpif_config *config)
> +{
> +	unsigned int value;
> +	void __iomem *base = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE);
> +
> +	value = __raw_readl(base + VSCLKDIS_OFFSET);
> +	value &= ~VSCLKDIS_MASK;
> +	__raw_writel(value, base + VSCLKDIS_OFFSET);
> +
> +	value = __raw_readl(base + VDD3P3V_PWDN_OFFSET);
> +	value &= ~VDD3P3V_VID_MASK;
> +	__raw_writel(value, base + VDD3P3V_PWDN_OFFSET);
> +
> +	davinci_cfg_reg(DM646X_STSOMUX_DISABLE);
> +	davinci_cfg_reg(DM646X_STSIMUX_DISABLE);
> +	davinci_cfg_reg(DM646X_PTSOMUX_DISABLE);
> +	davinci_cfg_reg(DM646X_PTSIMUX_DISABLE);
> +
> +	vpif_display_dev.dev.platform_data = config;
> +	platform_device_register(&vpif_display_dev);
> +}
> +
>  void __init dm646x_init(void)
>  {
>  	davinci_common_init(&davinci_soc_info_dm646x);
> diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h
> b/arch/arm/mach-davinci/include/mach/dm646x.h
> index 7afc613..9c3666c 100644
> --- a/arch/arm/mach-davinci/include/mach/dm646x.h
> +++ b/arch/arm/mach-davinci/include/mach/dm646x.h
> @@ -12,6 +12,7 @@
>  #define __ASM_ARCH_DM646X_H
> 
>  #include <linux/platform_device.h>
> +#include <linux/i2c.h>
>  #include <mach/hardware.h>
>  #include <mach/emac.h>
> 
> @@ -24,4 +25,28 @@
> 
>  void __init dm646x_init(void);
> 
> +void dm646x_video_init(void);
> +
> +struct vpif_output {
> +	u16 id;
> +	const char *name;
> +};
> +
> +struct subdev_info {
> +	unsigned short addr;
> +	const char *name;
> +};
> +
> +struct vpif_config {
> +	int (*set_clock)(int, int);
> +	const struct subdev_info *subdevinfo;
> +	int subdev_count;
> +	const char **output;
> +	int output_count;
> +	const char *card_name;
> +};
> +
> +
> +void dm646x_setup_vpif(struct vpif_config *config);
> +
>  #endif /* __ASM_ARCH_DM646X_H */
> --
> 1.5.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media"
> in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Hans Verkuil June 26, 2009, 6:10 p.m. UTC | #2 
On Monday 22 June 2009 10:14:30 chaithrika wrote:
> Kevin,
> 
> I think this patch has to be taken into DaVinci tree so that it
> can be submitted upstream. This patch has to be present in the Linux 
> tree for Hans to prepare a pull request for DM646x display driver 
> patches.

What are the plans for this patch? Will Kevin take care of this? In that
case the v4l patches will have to wait until this patch is in Linus' git
tree. Alternatively, we can pull this in via the v4l-dvb git tree. I think
that is propably the easiest approach.

I just need to know who will do what so we don't do duplicate work.

Regards,

	Hans

> 
> Regards,
> Chaithrika
> 
> > -----Original Message-----
> > From: linux-media-owner@vger.kernel.org [mailto:linux-media-
> > owner@vger.kernel.org] On Behalf Of Chaithrika U S
> > Sent: Friday, May 08, 2009 6:56 PM
> > To: linux-media@vger.kernel.org
> > Cc: davinci-linux-open-source@linux.davincidsp.com; Chaithrika U S;
> > Manjunath Hadli; Brijesh Jadav
> > Subject: [PATCH] Subject: [PATCH v3 1/4] ARM: DaVinci: DM646x Video:
> > Platform and board specific setup
> > 
> > Platform specific display device setup for DM646x EVM
> > 
> > Add platform device and resource structures. Also define a platform
> > specific
> > clock setup function that can be accessed by the driver to configure
> > the clock
> > and CPLD.
> > 
> > This patch is dependent on a patch submitted earlier, which adds
> > Pin Mux and clock definitions for Video on DM646x.
> > 
> > Signed-off-by: Manjunath Hadli <mrh@ti.com>
> > Signed-off-by: Brijesh Jadav <brijesh.j@ti.com>
> > Signed-off-by: Chaithrika U S <chaithrika@ti.com>
> > ---
> > Applies to Davinci GIT tree
> > 
> >  arch/arm/mach-davinci/board-dm646x-evm.c    |  122
> > +++++++++++++++++++++++++++
> >  arch/arm/mach-davinci/dm646x.c              |   63 ++++++++++++++
> >  arch/arm/mach-davinci/include/mach/dm646x.h |   25 ++++++
> >  3 files changed, 210 insertions(+), 0 deletions(-)
> >
Kevin Hilman June 26, 2009, 6:25 p.m. UTC | #3 
Hans Verkuil <hverkuil@xs4all.nl> writes:

> On Monday 22 June 2009 10:14:30 chaithrika wrote:
>> Kevin,
>> 
>> I think this patch has to be taken into DaVinci tree so that it
>> can be submitted upstream. This patch has to be present in the Linux 
>> tree for Hans to prepare a pull request for DM646x display driver 
>> patches.
>
> What are the plans for this patch? Will Kevin take care of this? In that
> case the v4l patches will have to wait until this patch is in Linus' git
> tree. Alternatively, we can pull this in via the v4l-dvb git tree. I think
> that is propably the easiest approach.

Hans, I'm ok if you pull this directly into v4l-dvb git.   But first, I
there are a couple minor problems with this patch.  I'll reply
to the original post.

Also, please let me know the url and branch so I can be sure to handle
any problems with other davinci patces going upstream.

Is this tree part of linux-next?  I now have a 'for-next' branch
of DaVinci git which is included in linux-next so any potential
conflicts will be found there as well.

Thanks,

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kevin Hilman June 26, 2009, 6:32 p.m. UTC | #4 
Chaithrika U S <chaithrika@ti.com> writes:

> Platform specific display device setup for DM646x EVM
>
> Add platform device and resource structures. Also define a platform specific
> clock setup function that can be accessed by the driver to configure the clock
> and CPLD.
>
> This patch is dependent on a patch submitted earlier, which adds
> Pin Mux and clock definitions for Video on DM646x.
>
> Signed-off-by: Manjunath Hadli <mrh@ti.com>
> Signed-off-by: Brijesh Jadav <brijesh.j@ti.com>
> Signed-off-by: Chaithrika U S <chaithrika@ti.com>
> ---
> Applies to Davinci GIT tree

Needs an update to apply to current linus or davinci git.

Other comments below...

[...]

>  static __init void davinci_dm646x_evm_irq_init(void)
> diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
> index 3cd09c1..94e17a3 100644
> --- a/arch/arm/mach-davinci/dm646x.c
> +++ b/arch/arm/mach-davinci/dm646x.c

[...]

> +static u64 vpif_dma_mask = DMA_32BIT_MASK;

This usage is deprecated, it should be DMA_BIT_MASK(32) as all the
other uses in mach-davinci/*

[...]

> index 7afc613..9c3666c 100644
> --- a/arch/arm/mach-davinci/include/mach/dm646x.h
> +++ b/arch/arm/mach-davinci/include/mach/dm646x.h
> @@ -12,6 +12,7 @@
>  #define __ASM_ARCH_DM646X_H
>  
>  #include <linux/platform_device.h>
> +#include <linux/i2c.h>

This part needs a refresh against current trees, but also please drop
this include, I don't see any users of i2c stuff in this file.

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kevin Hilman June 26, 2009, 6:36 p.m. UTC | #5 
Kevin Hilman <khilman@deeprootsystems.com> writes:

> Chaithrika U S <chaithrika@ti.com> writes:
>
>> Platform specific display device setup for DM646x EVM
>>
>> Add platform device and resource structures. Also define a platform specific
>> clock setup function that can be accessed by the driver to configure the clock
>> and CPLD.
>>
>> This patch is dependent on a patch submitted earlier, which adds
>> Pin Mux and clock definitions for Video on DM646x.
>>
>> Signed-off-by: Manjunath Hadli <mrh@ti.com>
>> Signed-off-by: Brijesh Jadav <brijesh.j@ti.com>
>> Signed-off-by: Chaithrika U S <chaithrika@ti.com>
>> ---
>> Applies to Davinci GIT tree
>
> Needs an update to apply to current linus or davinci git.

Please ignore this review, I see there was a newer version posted.
Will review shortly.

Sorry for the confusion.

Kevin

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Hans Verkuil June 26, 2009, 6:42 p.m. UTC | #6 
On Friday 26 June 2009 20:25:42 Kevin Hilman wrote:
> Hans Verkuil <hverkuil@xs4all.nl> writes:
> 
> > On Monday 22 June 2009 10:14:30 chaithrika wrote:
> >> Kevin,
> >> 
> >> I think this patch has to be taken into DaVinci tree so that it
> >> can be submitted upstream. This patch has to be present in the Linux 
> >> tree for Hans to prepare a pull request for DM646x display driver 
> >> patches.
> >
> > What are the plans for this patch? Will Kevin take care of this? In that
> > case the v4l patches will have to wait until this patch is in Linus' git
> > tree. Alternatively, we can pull this in via the v4l-dvb git tree. I think
> > that is propably the easiest approach.
> 
> Hans, I'm ok if you pull this directly into v4l-dvb git.   But first, I
> there are a couple minor problems with this patch.  I'll reply
> to the original post.

OK. I'll wait for the fixed patch and I'll then ask Mauro to merge this
platform patch and the vpif display driver into the v4l-dvb git tree.

> Also, please let me know the url and branch so I can be sure to handle
> any problems with other davinci patces going upstream.

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master

> Is this tree part of linux-next?

Yes.

> I now have a 'for-next' branch 
> of DaVinci git which is included in linux-next so any potential
> conflicts will be found there as well.

Regards,

	Hans
diff mbox

Patch

diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index a55f45c..b64ae1c 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -52,6 +52,19 @@ 
 #define DM646X_EVM_PHY_MASK		(0x2)
 #define DM646X_EVM_MDIO_FREQUENCY	(2200000) /* PHY bus frequency */
 
+#define VIDCLKCTL_OFFSET	(0x38)
+#define VSCLKDIS_OFFSET		(0x6c)
+
+#define VCH2CLK_MASK		(BIT_MASK(10) | BIT_MASK(9) | BIT_MASK(8))
+#define VCH2CLK_SYSCLK8		(BIT(9))
+#define VCH2CLK_AUXCLK		(BIT(9) | BIT(8))
+#define VCH3CLK_MASK		(BIT_MASK(14) | BIT_MASK(13) | BIT_MASK(12))
+#define VCH3CLK_SYSCLK8		(BIT(13))
+#define VCH3CLK_AUXCLK		(BIT(14) | BIT(13))
+
+#define VIDCH2CLK		(BIT(10))
+#define VIDCH3CLK		(BIT(11))
+
 static struct davinci_uart_config uart_config __initdata = {
 	.enabled_uarts = (1 << 0),
 };
@@ -206,6 +219,40 @@  static struct at24_platform_data eeprom_info = {
 	.context	= (void *)0x7f00,
 };
 
+static struct i2c_client *cpld_client;
+
+static int cpld_video_probe(struct i2c_client *client,
+			const struct i2c_device_id *id)
+{
+	cpld_client = client;
+	return 0;
+}
+
+static int __devexit cpld_video_remove(struct i2c_client *client)
+{
+	cpld_client = NULL;
+	return 0;
+}
+
+static const struct i2c_device_id cpld_video_id[] = {
+	{ "cpld_video", 0 },
+	{ }
+};
+
+static struct i2c_driver cpld_video_driver = {
+	.driver = {
+		.name	= "cpld_video",
+	},
+	.probe		= cpld_video_probe,
+	.remove		= cpld_video_remove,
+	.id_table	= cpld_video_id,
+};
+
+static void evm_init_cpld(void)
+{
+	i2c_add_driver(&cpld_video_driver);
+}
+
 static struct i2c_board_info __initdata i2c_info[] =  {
 	{
 		I2C_BOARD_INFO("24c256", 0x50),
@@ -215,6 +262,9 @@  static struct i2c_board_info __initdata i2c_info[] =  {
 		I2C_BOARD_INFO("pcf8574a", 0x38),
 		.platform_data	= &pcf_data,
 	},
+	{
+		I2C_BOARD_INFO("cpld_video", 0x3B),
+	},
 };
 
 static struct davinci_i2c_platform_data i2c_pdata = {
@@ -222,10 +272,81 @@  static struct davinci_i2c_platform_data i2c_pdata = {
 	.bus_delay      = 0 /* usec */,
 };
 
+static int set_vpif_clock(int mux_mode, int hd)
+{
+	int val = 0;
+	int err = 0;
+	unsigned int value;
+	void __iomem *base = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE);
+
+	/* disable the clock */
+	value = __raw_readl(base + VSCLKDIS_OFFSET);
+	value |= (VIDCH3CLK | VIDCH2CLK);
+	__raw_writel(value, base + VSCLKDIS_OFFSET);
+
+	val = i2c_smbus_read_byte(cpld_client);
+	if (val < 0)
+		return val;
+
+	if (mux_mode == 1)
+		val &= ~0x40;
+	else
+		val |= 0x40;
+
+	err = i2c_smbus_write_byte(cpld_client, val);
+	if (err)
+		return err;
+
+	value = __raw_readl(base + VIDCLKCTL_OFFSET);
+	value &= ~(VCH2CLK_MASK);
+	value &= ~(VCH3CLK_MASK);
+
+	if (hd >= 1)
+		value |= (VCH2CLK_SYSCLK8 | VCH3CLK_SYSCLK8);
+	else
+		value |= (VCH2CLK_AUXCLK | VCH3CLK_AUXCLK);
+
+	__raw_writel(value, base + VIDCLKCTL_OFFSET);
+
+	/* enable the clock */
+	value = __raw_readl(base + VSCLKDIS_OFFSET);
+	value &= ~(VIDCH3CLK | VIDCH2CLK);
+	__raw_writel(value, base + VSCLKDIS_OFFSET);
+
+	return 0;
+}
+
+static const struct subdev_info dm646x_vpif_subdev[] = {
+	{
+		.addr	= 0x2A,
+		.name	= "adv7343",
+	},
+	{
+		.addr	= 0x2C,
+		.name	= "ths7303",
+	},
+};
+
+static const char *output[] = {
+	"Composite",
+	"Component",
+	"S-Video",
+};
+
+static struct vpif_config dm646x_vpif_config = {
+	.set_clock	= set_vpif_clock,
+	.subdevinfo	= dm646x_vpif_subdev,
+	.subdev_count	= ARRAY_SIZE(dm646x_vpif_subdev),
+	.output		= output,
+	.output_count	= ARRAY_SIZE(output),
+	.card_name	= "DM646x EVM",
+};
+
 static void __init evm_init_i2c(void)
 {
 	davinci_init_i2c(&i2c_pdata);
 	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));
+	evm_init_cpld();
 }
 
 static void __init davinci_map_io(void)
@@ -242,6 +363,7 @@  static __init void evm_init(void)
 
 	soc_info->emac_pdata->phy_mask = DM646X_EVM_PHY_MASK;
 	soc_info->emac_pdata->mdio_max_freq = DM646X_EVM_MDIO_FREQUENCY;
+	dm646x_setup_vpif(&dm646x_vpif_config);
 }
 
 static __init void davinci_dm646x_evm_irq_init(void)
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 3cd09c1..94e17a3 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -13,6 +13,7 @@ 
 #include <linux/clk.h>
 #include <linux/serial_8250.h>
 #include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/mach/map.h>
 
@@ -31,6 +32,15 @@ 
 #include "clock.h"
 #include "mux.h"
 
+#define DAVINCI_VPIF_BASE       (0x01C12000)
+#define VDD3P3V_PWDN_OFFSET	(0x48)
+#define VSCLKDIS_OFFSET		(0x6C)
+
+#define VDD3P3V_VID_MASK	(BIT_MASK(7) | BIT_MASK(6) | BIT_MASK(5) |\
+					BIT_MASK(4))
+#define VSCLKDIS_MASK		(BIT_MASK(11) | BIT_MASK(10) | BIT_MASK(9) |\
+					BIT_MASK(8))
+
 /*
  * Device specific clocks
  */
@@ -509,6 +519,37 @@  static struct platform_device dm646x_edma_device = {
 	.resource		= edma_resources,
 };
 
+static u64 vpif_dma_mask = DMA_32BIT_MASK;
+
+static struct resource vpif_resource[] = {
+	{
+		.start	= DAVINCI_VPIF_BASE,
+		.end	= DAVINCI_VPIF_BASE + 0x03fff,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start = IRQ_DM646X_VP_VERTINT2,
+		.end   = IRQ_DM646X_VP_VERTINT2,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = IRQ_DM646X_VP_VERTINT3,
+		.end   = IRQ_DM646X_VP_VERTINT3,
+		.flags = IORESOURCE_IRQ,
+	},
+};
+
+static struct platform_device vpif_display_dev = {
+	.name		= "vpif_display",
+	.id		= -1,
+	.dev		= {
+			.dma_mask 		= &vpif_dma_mask,
+			.coherent_dma_mask	= DMA_32BIT_MASK,
+	},
+	.resource	= vpif_resource,
+	.num_resources	= ARRAY_SIZE(vpif_resource),
+};
+
 /*----------------------------------------------------------------------*/
 
 static struct map_desc dm646x_io_desc[] = {
@@ -619,6 +660,28 @@  static struct davinci_soc_info davinci_soc_info_dm646x = {
 	.sram_len		= SZ_32K,
 };
 
+void dm646x_setup_vpif(struct vpif_config *config)
+{
+	unsigned int value;
+	void __iomem *base = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE);
+
+	value = __raw_readl(base + VSCLKDIS_OFFSET);
+	value &= ~VSCLKDIS_MASK;
+	__raw_writel(value, base + VSCLKDIS_OFFSET);
+
+	value = __raw_readl(base + VDD3P3V_PWDN_OFFSET);
+	value &= ~VDD3P3V_VID_MASK;
+	__raw_writel(value, base + VDD3P3V_PWDN_OFFSET);
+
+	davinci_cfg_reg(DM646X_STSOMUX_DISABLE);
+	davinci_cfg_reg(DM646X_STSIMUX_DISABLE);
+	davinci_cfg_reg(DM646X_PTSOMUX_DISABLE);
+	davinci_cfg_reg(DM646X_PTSIMUX_DISABLE);
+
+	vpif_display_dev.dev.platform_data = config;
+	platform_device_register(&vpif_display_dev);
+}
+
 void __init dm646x_init(void)
 {
 	davinci_common_init(&davinci_soc_info_dm646x);
diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h
index 7afc613..9c3666c 100644
--- a/arch/arm/mach-davinci/include/mach/dm646x.h
+++ b/arch/arm/mach-davinci/include/mach/dm646x.h
@@ -12,6 +12,7 @@ 
 #define __ASM_ARCH_DM646X_H
 
 #include <linux/platform_device.h>
+#include <linux/i2c.h>
 #include <mach/hardware.h>
 #include <mach/emac.h>
 
@@ -24,4 +25,28 @@ 
 
 void __init dm646x_init(void);
 
+void dm646x_video_init(void);
+
+struct vpif_output {
+	u16 id;
+	const char *name;
+};
+
+struct subdev_info {
+	unsigned short addr;
+	const char *name;
+};
+
+struct vpif_config {
+	int (*set_clock)(int, int);
+	const struct subdev_info *subdevinfo;
+	int subdev_count;
+	const char **output;
+	int output_count;
+	const char *card_name;
+};
+
+
+void dm646x_setup_vpif(struct vpif_config *config);
+
 #endif /* __ASM_ARCH_DM646X_H */