2 files changed, 32 insertions, 1 deletions

diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
index d0fed3a67100..6aac880eb794 100644
--- a/arch/arm/mach-davinci/Makefile
+++ b/arch/arm/mach-davinci/Makefile
@@ -26,7 +26,7 @@ obj-$(CONFIG_MACH_SFFSDR)		+= board-sffsdr.o
 obj-$(CONFIG_MACH_NEUROS_OSD2)          += board-neuros-osd2.o
 obj-$(CONFIG_MACH_DAVINCI_DM355_EVM)    += board-dm355-evm.o
 obj-$(CONFIG_MACH_DM355_LEOPARD)        += board-dm355-leopard.o
-obj-$(CONFIG_MACH_DAVINCI_DM6467_EVM)   += board-dm646x-evm.o
+obj-$(CONFIG_MACH_DAVINCI_DM6467_EVM)   += board-dm646x-evm.o cdce949.o
 obj-$(CONFIG_MACH_DAVINCI_DM365_EVM)    += board-dm365-evm.o
 obj-$(CONFIG_MACH_DAVINCI_DA830_EVM)    += board-da830-evm.o
 obj-$(CONFIG_MACH_DAVINCI_DA850_EVM)    += board-da850-evm.o
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 542bfdbbea0f..815067b2413e 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -40,6 +40,8 @@
 #include <mach/serial.h>
 #include <mach/i2c.h>
 #include <mach/nand.h>
+#include <mach/clock.h>
+#include <mach/cdce949.h>
 
 #include "clock.h"
 
@@ -389,6 +391,9 @@ static struct i2c_board_info __initdata i2c_info[] =  {
         {
                 I2C_BOARD_INFO("cpld_video", 0x3b),
         },
+        {
+                I2C_BOARD_INFO("cdce949", 0x6c),
+        },
 };
 
 static struct davinci_i2c_platform_data i2c_pdata = {
@@ -681,9 +686,35 @@ static void __init evm_init_i2c(void)
         evm_init_video();
 }
 
+#define CDCE949_XIN_RATE        27000000
+
+/* CDCE949 support - "lpsc" field is overridden to work as clock number */
+static struct clk cdce_clk_in = {
+        .name   = "cdce_xin",
+        .rate   = CDCE949_XIN_RATE,
+};
+
+static struct davinci_clk cdce_clks[] = {
+        CLK(NULL, "xin", &cdce_clk_in),
+        CLK(NULL, NULL, NULL),
+};
+
+static void __init cdce_clk_init(void)
+{
+        struct davinci_clk *c;
+        struct clk *clk;
+
+        for (c = cdce_clks; c->lk.clk; c++) {
+                clk = c->lk.clk;
+                clkdev_add(&c->lk);
+                clk_register(clk);
+        }
+}
+
 static void __init davinci_map_io(void)
 {
         dm646x_init();
+        cdce_clk_init();
 }
 
 static struct davinci_uart_config uart_config __initdata = {