1 files changed, 20 insertions, 1 deletions

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 2cd008156de..92aeb560068 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -612,6 +612,11 @@ static struct resource vpfe_resources[] = {
                 .end            = IRQ_VDINT1,
                 .flags          = IORESOURCE_IRQ,
         },
+};
+
+static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32);
+static struct resource dm644x_ccdc_resource[] = {
+        /* CCDC Base address */
         {
                 .start          = 0x01c70400,
                 .end            = 0x01c70400 + 0xff,
@@ -619,7 +624,17 @@ static struct resource vpfe_resources[] = {
         },
 };
 
-static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32);
+static struct platform_device dm644x_ccdc_dev = {
+        .name           = "dm644x_ccdc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(dm644x_ccdc_resource),
+        .resource       = dm644x_ccdc_resource,
+        .dev = {
+                .dma_mask               = &vpfe_capture_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
 static struct platform_device vpfe_capture_dev = {
         .name           = CAPTURE_DRV_NAME,
         .id             = -1,
@@ -769,9 +784,13 @@ static int __init dm644x_init_devices(void)
         if (!cpu_is_davinci_dm644x())
                 return 0;
 
+        /* Add ccdc clock aliases */
+        clk_add_alias("master", dm644x_ccdc_dev.name, "vpss_master", NULL);
+        clk_add_alias("slave", dm644x_ccdc_dev.name, "vpss_slave", NULL);
         platform_device_register(&dm644x_edma_device);
         platform_device_register(&dm644x_emac_device);
         platform_device_register(&dm644x_vpss_device);
+        platform_device_register(&dm644x_ccdc_dev);
         platform_device_register(&vpfe_capture_dev);
 
         return 0;