Skip to content Skip to conversation

ARM: DaVinci: DM646x Video: Platform and board specific setup

PATCH Superseded Chaithrika U S 3 participants 7 messages Jul 20, 2009 – Aug 5, 2009

Subsystems (4)

Arm (32-bit) Media (V4L/DVB) Arm sub-architectures TI DaVinci machine support

Share & tools

Chaithrika U S

author

2009-07-20 08:52 UTC #0 lore raw

PATCH v3 1/1 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.

Signed-off-by Manjunath Hadli <[email protected]>

Signed-off-by Brijesh Jadav <[email protected]>

Signed-off-by Chaithrika U S <[email protected]>

Signed-off-by Kevin Hilman <[email protected]>

---
Applies to Davinci GIT tree. Minor updates like change in structure name- subdev_info to vpif_subdev_info and correction to VDD3P3V_VID_MASK value.

 arch/arm/mach-davinci/board-dm646x-evm.c    |  125 +++++++++++++++++++++++++++
 arch/arm/mach-davinci/dm646x.c              |   62 +++++++++++++
 arch/arm/mach-davinci/include/mach/dm646x.h |   24 +++++
 3 files changed, 211 insertions(+), 0 deletions(-)

arch/arm/mach-davinci/board-dm646x-evm.c +125 -0

index b1bf18c..8c88fd0 100644
@@ -63,6 +63,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),
 };

@@ -288,6 +301,40 @@ static struct snd_platform_data dm646x_evm_snd_data[] = {
 	},
 };
 
+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),

@@ -300,6 +347,9 @@ static struct i2c_board_info __initdata i2c_info[] =  {
 	{
 		I2C_BOARD_INFO("cpld_reg0", 0x3a),
 	},
+	{
+		I2C_BOARD_INFO("cpld_video", 0x3B),
+	},
 };
 
 static struct davinci_i2c_platform_data i2c_pdata = {

@@ -307,11 +357,85 @@ 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);
+
+	if (!cpld_client)
+		return -ENXIO;
+
+	/* 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 vpif_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_add_driver(&dm6467evm_cpld_driver);
 	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));
+	evm_init_cpld();
 }
 
 static void __init davinci_map_io(void)

@@ -333,6 +457,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)

arch/arm/mach-davinci/dm646x.c +62 -0

80 lines not on this page · raw message

arch/arm/mach-davinci/include/mach/dm646x.h +24 -0

index feb1e02..1ac424c 100644
@@ -29,4 +29,28 @@ void __init dm646x_init_ide(void);
 void __init dm646x_init_mcasp0(struct snd_platform_data *pdata);
 void __init dm646x_init_mcasp1(struct snd_platform_data *pdata);
 
+void dm646x_video_init(void);
+
+struct vpif_output {
+	u16 id;
+	const char *name;
+};
+
+struct vpif_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 */

Signature · 1 line

1.5.6

chaithrika

author

2009-08-03 03:49 UTC #1 lore raw

Mauro/Russell,

The previous version (v2) of this patch is on the linux-next tree. This patch has some updates done on top of that patch. Should I post an incremental patch for those changes to the Linux-next tree? Please suggest.

Regards,
Chaithrika

Quoted 3 lines · Chaithrika U S

Platform specific display device setup for DM646x EVM
Add platform device and resource structures. Also define a platform

specific

Quoted 1 line

clock setup function that can be accessed by the driver to configure the

clock

Quoted 11 lines

and CPLD.
Signed-off-by Manjunath Hadli <[email protected]>
Signed-off-by Brijesh Jadav <[email protected]>
Signed-off-by Chaithrika U S <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
---
Applies to Davinci GIT tree. Minor updates like change in structure name- subdev_info to vpif_subdev_info and correction to VDD3P3V_VID_MASK value.
 arch/arm/mach-davinci/board-dm646x-evm.c    |  125

+++++++++++++++++++++++++++

Review

Quoted 5 lines

 arch/arm/mach-davinci/dm646x.c              |   62 +++++++++++++
 arch/arm/mach-davinci/include/mach/dm646x.h |   24 +++++
 3 files changed, 211 insertions(+), 0 deletions(-)

(quoted diff) +0 -0

b/arch/arm/mach-davinci/board-dm646x-evm.c

arch/arm/mach-davinci/board-dm646x-evm.c static struct snd_platform_data dm646x_evm_snd_data[]

Quoted 24 lines

index b1bf18c..8c88fd0 100644

arch/arm/mach-davinci/board-dm646x-evm.c +13 -0

@@ -63,6 +63,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),
 };

@@ -288,6 +301,40 @@ static struct snd_platform_data dm646x_evm_snd_data[]

= {

arch/arm/mach-davinci/board-dm646x-evm.c static struct i2c_board_info __initdata i2c_info[] =

Quoted 41 lines

arch/arm/mach-davinci/board-dm646x-evm.c +34 -0

 	},
 };
 
+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),

@@ -300,6 +347,9 @@ static struct i2c_board_info __initdata i2c_info[] =

{

arch/arm/mach-davinci/board-dm646x-evm.c static struct davinci_i2c_platform_data i2c_pdata =

Quoted 10 lines

arch/arm/mach-davinci/board-dm646x-evm.c +3 -0

 	{
 		I2C_BOARD_INFO("cpld_reg0", 0x3a),
 	},
+	{
+		I2C_BOARD_INFO("cpld_video", 0x3B),
+	},
 };
 
 static struct davinci_i2c_platform_data i2c_pdata = {

@@ -307,11 +357,85 @@ static struct davinci_i2c_platform_data i2c_pdata =

{

Review

Quoted 94 lines

arch/arm/mach-davinci/board-dm646x-evm.c +75 -0

 	.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);
+
+	if (!cpld_client)
+		return -ENXIO;
+
+	/* 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 vpif_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_add_driver(&dm6467evm_cpld_driver);
 	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));
+	evm_init_cpld();
 }
 
 static void __init davinci_map_io(void)

@@ -333,6 +457,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)

(quoted diff) +0 -0

b/arch/arm/mach-davinci/dm646x.c

Quoted 4 lines

index 8fa2803..a9b20e5 100644

arch/arm/mach-davinci/dm646x.c line 41

Quoted 10 lines

arch/arm/mach-davinci/dm646x.c +7 -0

@@ -32,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(3) | BIT_MASK(2) | BIT_MASK(1) |\
+					BIT_MASK(0))
+#define VSCLKDIS_MASK		(BIT_MASK(11) | BIT_MASK(10) |

BIT_MASK(9) |\

Quoted 31 lines

arch/arm/mach-davinci/dm646x.c +24 -0

+					BIT_MASK(8))
+
 /*
  * Device specific clocks
  */

@@ -686,6 +695,37 @@ static struct platform_device dm646x_dit_device = {
 	.id	= -1,
 };
 
+static u64 vpif_dma_mask = DMA_BIT_MASK(32);
+
+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",

arch/arm/mach-davinci/dm646x.c static struct platform_device dm646x_dit_device = { · line 729

Quoted 10 lines

arch/arm/mach-davinci/dm646x.c +9 -0

+	.id		= -1,
+	.dev		= {
+			.dma_mask 		= &vpif_dma_mask,
+			.coherent_dma_mask	= DMA_BIT_MASK(32),
+	},
+	.resource	= vpif_resource,
+	.num_resources	= ARRAY_SIZE(vpif_resource),
+};
+

/*----------------------------------------------------------------------*/

arch/arm/mach-davinci/dm646x.c void __init dm646x_init_mcasp1(struct

Quoted 3 lines

arch/arm/mach-davinci/dm646x.c +0 -0

 static struct map_desc dm646x_io_desc[] = {

@@ -814,6 +854,28 @@ void __init dm646x_init_mcasp1(struct

snd_platform_data *pdata)

Review

Quoted 29 lines

arch/arm/mach-davinci/dm646x.c +22 -0

 	platform_device_register(&dm646x_dit_device);
 }
 
+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);

(quoted diff) +0 -0

b/arch/arm/mach-davinci/include/mach/dm646x.h

Quoted 35 lines

index feb1e02..1ac424c 100644

arch/arm/mach-davinci/include/mach/dm646x.h +24 -0

@@ -29,4 +29,28 @@ void __init dm646x_init_ide(void);
 void __init dm646x_init_mcasp0(struct snd_platform_data *pdata);
 void __init dm646x_init_mcasp1(struct snd_platform_data *pdata);
 
+void dm646x_video_init(void);
+
+struct vpif_output {
+	u16 id;
+	const char *name;
+};
+
+struct vpif_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 */

Signature · 1 line

1.5.6

Mauro Carvalho Chehab

2009-08-03 05:50 UTC #2 lore raw

Em Mon, 3 Aug 2009 09:17:06 +0530
"chaithrika" <[email protected]> escreveu:

Quoted 7 lines

Mauro/Russell,
The previous version (v2) of this patch is on the linux-next tree. This patch has some updates done on top of that patch. Should I post an incremental patch for those changes to the Linux-next tree? Please suggest.

It is not needed. After having Russell ack, I'll just replace the old patch by the new one.

Cheers,
Mauro

chaithrika

author

2009-08-03 09:30 UTC #3 lore raw

Mauro,

OK. Thank you for taking care of this.

Quoted 11 lines · Mauro Carvalho Chehab

Em Mon, 3 Aug 2009 09:17:06 +0530
"chaithrika" <[email protected]> escreveu:
Quoted 7 lines
Mauro/Russell,
The previous version (v2) of this patch is on the linux-next tree. This patch has some updates done on top of that patch. Should I post an incremental patch for those changes to the Linux-next tree? Please suggest.
It is not needed. After having Russell ack, I'll just replace the old

patch by the new one.

Quoted 6 lines

Cheers,
Mauro

Regards,
Chaithrika

Karicheri, Muralidharan

2009-08-04 20:40 UTC #4 lore raw

Chaithrika,

Could you send the patches inline to Russell King [email protected]? This was what Mauro had suggested to me.

We need to get a resolution on this quickly since I have some patches waiting to be submitted against display driver and would like to base it on your patches.

Regards,

Murali Karicheri
Software Design Engineer
Texas Instruments Inc.
Germantown, MD 20874
new phone: 301-407-9583
Old Phone : 301-515-3736 (will be deprecated)
email: [email protected]

Quoted 44 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Subrahmanya, Chaithrika
Sent: Monday, August 03, 2009 5:27 AM
To: 'Mauro Carvalho Chehab'
Cc: [email protected]; [email protected]; [email protected]
Subject: RE: [PATCH v3] ARM: DaVinci: DM646x Video: Platform and board specific setup
Mauro,
OK. Thank you for taking care of this.
Quoted 11 lines · Mauro Carvalho Chehab
Em Mon, 3 Aug 2009 09:17:06 +0530
"chaithrika" <[email protected]> escreveu:
Quoted 7 lines
Mauro/Russell,
The previous version (v2) of this patch is on the linux-next tree. This patch has some updates done on top of that patch. Should I post an incremental patch for those changes to the Linux-next tree? Please suggest.
It is not needed. After having Russell ack, I'll just replace the old
patch by the new one.
Quoted 6 lines
Cheers,
Mauro
Regards,
Chaithrika
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Karicheri, Muralidharan

2009-08-04 21:15 UTC #5 lore raw

In reply to Chaithrika U S

Quoted 309 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Subrahmanya, Chaithrika
Sent: Monday, July 20, 2009 4:01 AM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]
Subject: [PATCH v3] 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.

Signed-off-by Manjunath Hadli <[email protected]>

Signed-off-by Brijesh Jadav <[email protected]>

Signed-off-by Chaithrika U S <[email protected]>

Signed-off-by Kevin Hilman <[email protected]>

---
Applies to Davinci GIT tree. Minor updates like change in structure name- subdev_info to vpif_subdev_info and correction to VDD3P3V_VID_MASK value.

arch/arm/mach-davinci/board-dm646x-evm.c | 125
+++++++++++++++++++++++++++

arch/arm/mach-davinci/dm646x.c              |   62 +++++++++++++
arch/arm/mach-davinci/include/mach/dm646x.h |   24 +++++
3 files changed, 211 insertions(+), 0 deletions(-)

arch/arm/mach- renamed from arch/arm/mach-davinci/board-dm646x-evm.c +0 -0

davinci/board-dm646x-evm.c
index b1bf18c..8c88fd0 100644

arch/arm/mach-davinci/board-dm646x-evm.c +47 -0

@@ -63,6 +63,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),
 };

@@ -288,6 +301,40 @@ static struct snd_platform_data dm646x_evm_snd_data[]
 = {
 	},
 };
 
+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),

arch/arm/mach-davinci/board-dm646x-evm.c +78 -0

@@ -300,6 +347,9 @@ static struct i2c_board_info __initdata i2c_info[] =  {
 	{
 		I2C_BOARD_INFO("cpld_reg0", 0x3a),
 	},
+	{
+		I2C_BOARD_INFO("cpld_video", 0x3B),
+	},
 };
 
 static struct davinci_i2c_platform_data i2c_pdata = {

@@ -307,11 +357,85 @@ 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);
+
+	if (!cpld_client)
+		return -ENXIO;
+
+	/* 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 vpif_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_add_driver(&dm6467evm_cpld_driver);
 	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));
+	evm_init_cpld();
 }
 
 static void __init davinci_map_io(void)

@@ -333,6 +457,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)

arch/arm/mach- renamed from arch/arm/mach-davinci/dm646x.c +0 -0

davinci/dm646x.c
index 8fa2803..a9b20e5 100644

arch/arm/mach-davinci/dm646x.c +62 -0

@@ -32,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(3) | BIT_MASK(2) | BIT_MASK(1) |\
+					BIT_MASK(0))
+#define VSCLKDIS_MASK		(BIT_MASK(11) | BIT_MASK(10) | BIT_MASK(9) |\
+					BIT_MASK(8))
+
 /*
 * Device specific clocks
 */

@@ -686,6 +695,37 @@ static struct platform_device dm646x_dit_device = {
 	.id	= -1,
 };
 
+static u64 vpif_dma_mask = DMA_BIT_MASK(32);
+
+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_BIT_MASK(32),
+	},
+	.resource	= vpif_resource,
+	.num_resources	= ARRAY_SIZE(vpif_resource),
+};
+
 /*----------------------------------------------------------------------*/
 
 static struct map_desc dm646x_io_desc[] = {

@@ -814,6 +854,28 @@ void __init dm646x_init_mcasp1(struct
 snd_platform_data *pdata)
 	platform_device_register(&dm646x_dit_device);
 }
 
+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);

arch/arm/mach- renamed from arch/arm/mach-davinci/include/mach/dm646x.h +0 -0

davinci/include/mach/dm646x.h
index feb1e02..1ac424c 100644

arch/arm/mach-davinci/include/mach/dm646x.h +5 -0

@@ -29,4 +29,28 @@ void __init dm646x_init_ide(void);
 void __init dm646x_init_mcasp0(struct snd_platform_data *pdata);
 void __init dm646x_init_mcasp1(struct snd_platform_data *pdata);
 
+void dm646x_video_init(void);
+
+struct vpif_output {
+	u16 id;
+	const char *name;

arch/arm/mach-davinci/include/mach/dm646x.h void __init dm646x_init_ide(void); · line 46

Quoted 10 lines

arch/arm/mach-davinci/include/mach/dm646x.h +10 -0

+};
+
+struct vpif_subdev_info {
+	unsigned short addr;
+	const char *name;
+};
+
+struct vpif_config {
+	int (*set_clock)(int, int);
+	const struct subdev_info *subdevinfo;

Shouldn't this change as well to below?
const struct vpif_subdev_info *subdevinfo;

Quoted 17 lines

arch/arm/mach-davinci/include/mach/dm646x.h +9 -1
+	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
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

chaithrika

author

2009-08-05 05:05 UTC #6 lore raw

Quoted 9 lines · Muralidharan

Quoted 9 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Subrahmanya, Chaithrika
Sent: Monday, July 20, 2009 4:01 AM
To: [email protected]
Cc: [email protected];

[email protected];

Quoted 2 lines

Quoted 2 lines
[email protected]
Subject: [PATCH v3] ARM: DaVinci: DM646x Video: Platform and board

specific

Quoted 33 lines

Quoted 33 lines
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.
Signed-off-by Manjunath Hadli <[email protected]>
Signed-off-by Brijesh Jadav <[email protected]>
Signed-off-by Chaithrika U S <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
---
Applies to Davinci GIT tree. Minor updates like change in structure name- subdev_info to vpif_subdev_info and correction to VDD3P3V_VID_MASK value.
arch/arm/mach-davinci/board-dm646x-evm.c | 125
+++++++++++++++++++++++++++
arch/arm/mach-davinci/dm646x.c              |   62 +++++++++++++
arch/arm/mach-davinci/include/mach/dm646x.h |   24 +++++
3 files changed, 211 insertions(+), 0 deletions(-)
arch/arm/mach- renamed from arch/arm/mach-davinci/board-dm646x-evm.c +0 -0
davinci/board-dm646x-evm.c
index b1bf18c..8c88fd0 100644
arch/arm/mach-davinci/board-dm646x-evm.c +0 -0
@@ -63,6 +63,19 @@
 #define DM646X_EVM_PHY_MASK		(0x2)
 #define DM646X_EVM_MDIO_FREQUENCY	(2200000) /* PHY bus frequency */
 

Quoted 4 lines

arch/arm/mach-davinci/board-dm646x-evm.c
Quoted 4 lines
arch/arm/mach-davinci/board-dm646x-evm.c +4 -0
+#define VIDCLKCTL_OFFSET	(0x38)
+#define VSCLKDIS_OFFSET		(0x6c)
+
+#define VCH2CLK_MASK		(BIT_MASK(10) | BIT_MASK(9) |

BIT_MASK(8))

Quoted 3 lines

arch/arm/mach-davinci/board-dm646x-evm.c
Quoted 3 lines
arch/arm/mach-davinci/board-dm646x-evm.c +3 -0
+#define VCH2CLK_SYSCLK8		(BIT(9))
+#define VCH2CLK_AUXCLK		(BIT(9) | BIT(8))
+#define VCH3CLK_MASK		(BIT_MASK(14) | BIT_MASK(13) |

BIT_MASK(12))

Quoted 10 lines

arch/arm/mach-davinci/board-dm646x-evm.c static struct snd_platform_data

Quoted 10 lines

arch/arm/mach-davinci/board-dm646x-evm.c +6 -0

+#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),
 };

@@ -288,6 +301,40 @@ static struct snd_platform_data

dm646x_evm_snd_data[]

Quoted 34 lines

Quoted 34 lines

arch/arm/mach-davinci/board-dm646x-evm.c +30 -0

 = {
 	},
 };
 
+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)

Quoted 8 lines

arch/arm/mach-davinci/board-dm646x-evm.c static struct i2c_board_info __initdata i2c_info[] =
Quoted 8 lines
arch/arm/mach-davinci/board-dm646x-evm.c +4 -0
+{
+	i2c_add_driver(&cpld_video_driver);
+}
+
 static struct i2c_board_info __initdata i2c_info[] =  {
 	{
		I2C_BOARD_INFO("24c256", 0x50),
arch/arm/mach-davinci/board-dm646x-evm.c +0 -0
@@ -300,6 +347,9 @@ static struct i2c_board_info __initdata i2c_info[] =

{

Quoted 10 lines

arch/arm/mach-davinci/board-dm646x-evm.c static struct davinci_i2c_platform_data i2c_pdata =
Quoted 10 lines
arch/arm/mach-davinci/board-dm646x-evm.c +3 -0
 	{
 		I2C_BOARD_INFO("cpld_reg0", 0x3a),
 	},
+	{
+		I2C_BOARD_INFO("cpld_video", 0x3B),
+	},
 };
 
 static struct davinci_i2c_platform_data i2c_pdata = {
@@ -307,11 +357,85 @@ static struct davinci_i2c_platform_data i2c_pdata =

{

Quoted 102 lines

Quoted 102 lines

arch/arm/mach-davinci/board-dm646x-evm.c +75 -0

 	.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);
+
+	if (!cpld_client)
+		return -ENXIO;
+
+	/* 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 vpif_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_add_driver(&dm6467evm_cpld_driver);
 	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));
+	evm_init_cpld();
 }
 
 static void __init davinci_map_io(void)

@@ -333,6 +457,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)

arch/arm/mach- renamed from arch/arm/mach-davinci/dm646x.c +0 -0

davinci/dm646x.c
index 8fa2803..a9b20e5 100644

arch/arm/mach-davinci/dm646x.c +0 -0

@@ -32,6 +32,15 @@
 #include "clock.h"
 #include "mux.h"

Quoted 7 lines

arch/arm/mach-davinci/dm646x.c

Quoted 7 lines

arch/arm/mach-davinci/dm646x.c +7 -0

+#define DAVINCI_VPIF_BASE       (0x01C12000)
+#define VDD3P3V_PWDN_OFFSET	(0x48)
+#define VSCLKDIS_OFFSET		(0x6C)
+
+#define VDD3P3V_VID_MASK	(BIT_MASK(3) | BIT_MASK(2) | BIT_MASK(1) |\
+					BIT_MASK(0))
+#define VSCLKDIS_MASK		(BIT_MASK(11) | BIT_MASK(10) |

BIT_MASK(9) |\

Quoted 33 lines

Quoted 33 lines

arch/arm/mach-davinci/dm646x.c +26 -0

+					BIT_MASK(8))
+
 /*
 * Device specific clocks
 */

@@ -686,6 +695,37 @@ static struct platform_device dm646x_dit_device = {
 	.id	= -1,
 };
 
+static u64 vpif_dma_mask = DMA_BIT_MASK(32);
+
+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		= {

Quoted 8 lines

arch/arm/mach-davinci/dm646x.c static struct platform_device dm646x_dit_device = { · line 730
Quoted 8 lines
arch/arm/mach-davinci/dm646x.c +7 -0
+			.dma_mask 		= &vpif_dma_mask,
+			.coherent_dma_mask	= DMA_BIT_MASK(32),
+	},
+	.resource	= vpif_resource,
+	.num_resources	= ARRAY_SIZE(vpif_resource),
+};
+
 

/*----------------------------------------------------------------------*/

Quoted 50 lines

Quoted 50 lines

arch/arm/mach-davinci/dm646x.c +22 -0

 static struct map_desc dm646x_io_desc[] = {

@@ -814,6 +854,28 @@ void __init dm646x_init_mcasp1(struct
 snd_platform_data *pdata)
 	platform_device_register(&dm646x_dit_device);
 }
 
+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);

arch/arm/mach- renamed from arch/arm/mach-davinci/include/mach/dm646x.h +0 -0

davinci/include/mach/dm646x.h
index feb1e02..1ac424c 100644

arch/arm/mach-davinci/include/mach/dm646x.h +9 -0

@@ -29,4 +29,28 @@ void __init dm646x_init_ide(void);
 void __init dm646x_init_mcasp0(struct snd_platform_data *pdata);
 void __init dm646x_init_mcasp1(struct snd_platform_data *pdata);
 
+void dm646x_video_init(void);
+
+struct vpif_output {
+	u16 id;
+	const char *name;
+};
+
+struct vpif_subdev_info {
+	unsigned short addr;

Quoted 8 lines

arch/arm/mach-davinci/include/mach/dm646x.h void __init dm646x_init_ide(void); · line 46
Quoted 6 lines
arch/arm/mach-davinci/include/mach/dm646x.h +6 -0
+	const char *name;
+};
+
+struct vpif_config {
+	int (*set_clock)(int, int);
+	const struct subdev_info *subdevinfo;
Shouldn't this change as well to below?
const struct vpif_subdev_info *subdevinfo;

Yes, it should be, will submit an updated patch soon.

Thanks,
Chaithrika

Quoted 14 lines

Quoted 14 lines

arch/arm/mach-davinci/include/mach/dm646x.h +9 -1

+	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

Quoted 5 lines

Quoted 4 lines
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Regards,
Chaithrika