22 files changed, 88 insertions, 34 deletions

diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 6da25eebf911..12e6f756361d 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -246,7 +246,6 @@ static struct davinci_mmc_config da830_evm_mmc_config = {
         .wires                  = 8,
         .max_freq               = 50000000,
         .caps                   = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
-        .version                = MMC_CTLR_VERSION_2,
 };
 
 static inline void da830_evm_init_mmc(void)
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index c2dfe06563df..dcc8710936a5 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -802,7 +802,6 @@ static struct davinci_mmc_config da850_mmc_config = {
         .wires          = 4,
         .max_freq       = 50000000,
         .caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
-        .version        = MMC_CTLR_VERSION_2,
 };
 
 static const short da850_evm_mmcsd0_pins[] __initconst = {
@@ -1372,7 +1371,6 @@ static struct davinci_mmc_config da850_wl12xx_mmc_config = {
         .max_freq       = 25000000,
         .caps           = MMC_CAP_4_BIT_DATA | MMC_CAP_NONREMOVABLE |
                           MMC_CAP_POWER_OFF_CARD,
-        .version        = MMC_CTLR_VERSION_2,
 };
 
 static const short da850_wl12xx_pins[] __initconst = {
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 147b8e1a4407..bfdf8b979a64 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -280,7 +280,6 @@ static struct davinci_mmc_config dm355evm_mmc_config = {
         .wires          = 4,
         .max_freq       = 50000000,
         .caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
-        .version        = MMC_CTLR_VERSION_1,
 };
 
 /* Don't connect anything to J10 unless you're only using USB host
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index c2d4958a0cb6..4cfdd9109e19 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -253,7 +253,6 @@ static struct davinci_mmc_config dm365evm_mmc_config = {
         .wires          = 4,
         .max_freq       = 50000000,
         .caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
-        .version        = MMC_CTLR_VERSION_2,
 };
 
 static void dm365evm_emac_configure(void)
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 71735e7797cc..c0206d5f2bf6 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -570,7 +570,6 @@ static struct davinci_mmc_config dm6446evm_mmc_config = {
         .get_cd         = dm6444evm_mmc_get_cd,
         .get_ro         = dm6444evm_mmc_get_ro,
         .wires          = 4,
-        .version        = MMC_CTLR_VERSION_1
 };
 
 static struct i2c_board_info __initdata i2c_info[] =  {
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 1c98107527fa..b70e83c03bed 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -164,7 +164,6 @@ static void __init davinci_ntosd2_map_io(void)
 
 static struct davinci_mmc_config davinci_ntosd2_mmc_config = {
         .wires          = 4,
-        .version        = MMC_CTLR_VERSION_1
 };
 
 
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index 5a2bd44da54d..328dbd8a37f5 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -136,7 +136,6 @@ static struct davinci_mmc_config da850_mmc_config = {
         .wires          = 4,
         .max_freq       = 50000000,
         .caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
-        .version        = MMC_CTLR_VERSION_2,
 };
 
 static __init void omapl138_hawk_mmc_init(void)
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index 4f416023d4e2..ba798370fc96 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -85,7 +85,6 @@ static struct davinci_mmc_config mmc_config = {
         .wires          = 4,
         .max_freq       = 50000000,
         .caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
-        .version        = MMC_CTLR_VERSION_1,
 };
 
 static const short sdio1_pins[] __initconst = {
diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c
index d458558ee84a..dc9a470ff9c5 100644
--- a/arch/arm/mach-davinci/clock.c
+++ b/arch/arm/mach-davinci/clock.c
@@ -35,19 +35,26 @@ static void __clk_enable(struct clk *clk)
 {
         if (clk->parent)
                 __clk_enable(clk->parent);
-        if (clk->usecount++ == 0 && (clk->flags & CLK_PSC))
-                davinci_psc_config(clk->domain, clk->gpsc, clk->lpsc,
-                                true, clk->flags);
+        if (clk->usecount++ == 0) {
+                if (clk->flags & CLK_PSC)
+                        davinci_psc_config(clk->domain, clk->gpsc, clk->lpsc,
+                                           true, clk->flags);
+                else if (clk->clk_enable)
+                        clk->clk_enable(clk);
+        }
 }
 
 static void __clk_disable(struct clk *clk)
 {
         if (WARN_ON(clk->usecount == 0))
                 return;
-        if (--clk->usecount == 0 && !(clk->flags & CLK_PLL) &&
-            (clk->flags & CLK_PSC))
-                davinci_psc_config(clk->domain, clk->gpsc, clk->lpsc,
-                                false, clk->flags);
+        if (--clk->usecount == 0) {
+                if (!(clk->flags & CLK_PLL) && (clk->flags & CLK_PSC))
+                        davinci_psc_config(clk->domain, clk->gpsc, clk->lpsc,
+                                           false, clk->flags);
+                else if (clk->clk_disable)
+                        clk->clk_disable(clk);
+        }
         if (clk->parent)
                 __clk_disable(clk->parent);
 }
diff --git a/arch/arm/mach-davinci/clock.h b/arch/arm/mach-davinci/clock.h
index 8694b395fc92..1e4e836173a1 100644
--- a/arch/arm/mach-davinci/clock.h
+++ b/arch/arm/mach-davinci/clock.h
@@ -104,6 +104,8 @@ struct clk {
         int (*set_rate) (struct clk *clk, unsigned long rate);
         int (*round_rate) (struct clk *clk, unsigned long rate);
         int (*reset) (struct clk *clk, bool reset);
+        void (*clk_enable) (struct clk *clk);
+        void (*clk_disable) (struct clk *clk);
 };
 
 /* Clock flags: SoC-specific flags start at BIT(16) */
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 678a54a64dae..abbaf0270be6 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -394,7 +394,7 @@ static struct clk_lookup da830_clks[] = {
         CLK(NULL,               "tpcc",         &tpcc_clk),
         CLK(NULL,               "tptc0",        &tptc0_clk),
         CLK(NULL,               "tptc1",        &tptc1_clk),
-        CLK("davinci_mmc.0",    NULL,           &mmcsd_clk),
+        CLK("da830-mmc.0",      NULL,           &mmcsd_clk),
         CLK(NULL,               "uart0",        &uart0_clk),
         CLK(NULL,               "uart1",        &uart1_clk),
         CLK(NULL,               "uart2",        &uart2_clk),
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 0c4a26ddebba..4d6933848abf 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -383,6 +383,49 @@ static struct clk dsp_clk = {
         .flags          = PSC_LRST | PSC_FORCE,
 };
 
+static struct clk ehrpwm_clk = {
+        .name           = "ehrpwm",
+        .parent         = &pll0_sysclk2,
+        .lpsc           = DA8XX_LPSC1_PWM,
+        .gpsc           = 1,
+        .flags          = DA850_CLK_ASYNC3,
+};
+
+#define DA8XX_EHRPWM_TBCLKSYNC  BIT(12)
+
+static void ehrpwm_tblck_enable(struct clk *clk)
+{
+        u32 val;
+
+        val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP1_REG));
+        val |= DA8XX_EHRPWM_TBCLKSYNC;
+        writel(val, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP1_REG));
+}
+
+static void ehrpwm_tblck_disable(struct clk *clk)
+{
+        u32 val;
+
+        val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP1_REG));
+        val &= ~DA8XX_EHRPWM_TBCLKSYNC;
+        writel(val, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP1_REG));
+}
+
+static struct clk ehrpwm_tbclk = {
+        .name           = "ehrpwm_tbclk",
+        .parent         = &ehrpwm_clk,
+        .clk_enable     = ehrpwm_tblck_enable,
+        .clk_disable    = ehrpwm_tblck_disable,
+};
+
+static struct clk ecap_clk = {
+        .name           = "ecap",
+        .parent         = &pll0_sysclk2,
+        .lpsc           = DA8XX_LPSC1_ECAP,
+        .gpsc           = 1,
+        .flags          = DA850_CLK_ASYNC3,
+};
+
 static struct clk_lookup da850_clks[] = {
         CLK(NULL,               "ref",          &ref_clk),
         CLK(NULL,               "pll0",         &pll0_clk),
@@ -420,8 +463,8 @@ static struct clk_lookup da850_clks[] = {
         CLK("davinci_emac.1",   NULL,           &emac_clk),
         CLK("davinci-mcasp.0",  NULL,           &mcasp_clk),
         CLK("da8xx_lcdc.0",     "fck",          &lcdc_clk),
-        CLK("davinci_mmc.0",    NULL,           &mmcsd0_clk),
-        CLK("davinci_mmc.1",    NULL,           &mmcsd1_clk),
+        CLK("da830-mmc.0",      NULL,           &mmcsd0_clk),
+        CLK("da830-mmc.1",      NULL,           &mmcsd1_clk),
         CLK(NULL,               "aemif",        &aemif_clk),
         CLK(NULL,               "usb11",        &usb11_clk),
         CLK(NULL,               "usb20",        &usb20_clk),
@@ -430,6 +473,9 @@ static struct clk_lookup da850_clks[] = {
         CLK("vpif",             NULL,           &vpif_clk),
         CLK("ahci",             NULL,           &sata_clk),
         CLK("davinci-rproc.0",  NULL,           &dsp_clk),
+        CLK("ehrpwm",           "fck",          &ehrpwm_clk),
+        CLK("ehrpwm",           "tbclk",        &ehrpwm_tbclk),
+        CLK("ecap",             "fck",          &ecap_clk),
         CLK(NULL,               NULL,           NULL),
 };
 
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 6b7a0a27fbd1..fb8d8607f445 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -40,6 +40,13 @@ static void __init da8xx_init_irq(void)
 struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
         OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),
         OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "watchdog", NULL),
+        OF_DEV_AUXDATA("ti,da830-mmc", 0x01c40000, "da830-mmc.0", NULL),
+        OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f00000, "ehrpwm", NULL),
+        OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f02000, "ehrpwm", NULL),
+        OF_DEV_AUXDATA("ti,da850-ecap", 0x01f06000, "ecap", NULL),
+        OF_DEV_AUXDATA("ti,da850-ecap", 0x01f07000, "ecap", NULL),
+        OF_DEV_AUXDATA("ti,da850-ecap", 0x01f08000, "ecap", NULL),
+        OF_DEV_AUXDATA("ti,da830-spi", 0x01f0e000, "spi_davinci.1", NULL),
         {}
 };
 
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index fc50243b1481..cb97e07db284 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -664,7 +664,7 @@ static struct resource da8xx_mmcsd0_resources[] = {
 };
 
 static struct platform_device da8xx_mmcsd0_device = {
-        .name           = "davinci_mmc",
+        .name           = "da830-mmc",
         .id             = 0,
         .num_resources  = ARRAY_SIZE(da8xx_mmcsd0_resources),
         .resource       = da8xx_mmcsd0_resources,
@@ -701,7 +701,7 @@ static struct resource da850_mmcsd1_resources[] = {
 };
 
 static struct platform_device da850_mmcsd1_device = {
-        .name           = "davinci_mmc",
+        .name           = "da830-mmc",
         .id             = 1,
         .num_resources  = ARRAY_SIZE(da850_mmcsd1_resources),
         .resource       = da850_mmcsd1_resources,
diff --git a/arch/arm/mach-davinci/devices-tnetv107x.c b/arch/arm/mach-davinci/devices-tnetv107x.c
index 773ab07a71a0..cfb194df18ed 100644
--- a/arch/arm/mach-davinci/devices-tnetv107x.c
+++ b/arch/arm/mach-davinci/devices-tnetv107x.c
@@ -218,7 +218,7 @@ static u64 mmc1_dma_mask = DMA_BIT_MASK(32);
 
 static struct platform_device mmc_devices[2] = {
         {
-                .name           = "davinci_mmc",
+                .name           = "dm6441-mmc",
                 .id             = 0,
                 .dev            = {
                         .dma_mask               = &mmc0_dma_mask,
@@ -228,7 +228,7 @@ static struct platform_device mmc_devices[2] = {
                 .resource       = mmc0_resources
         },
         {
-                .name           = "davinci_mmc",
+                .name           = "dm6441-mmc",
                 .id             = 1,
                 .dev            = {
                         .dma_mask               = &mmc1_dma_mask,
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index 4c48a36ee567..f6927df2dda8 100644
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -150,7 +150,7 @@ static struct resource mmcsd0_resources[] = {
 };
 
 static struct platform_device davinci_mmcsd0_device = {
-        .name = "davinci_mmc",
+        .name = "dm6441-mmc",
         .id = 0,
         .dev = {
                 .dma_mask = &mmcsd0_dma_mask,
@@ -187,7 +187,7 @@ static struct resource mmcsd1_resources[] = {
 };
 
 static struct platform_device davinci_mmcsd1_device = {
-        .name = "davinci_mmc",
+        .name = "dm6441-mmc",
         .id = 1,
         .dev = {
                 .dma_mask = &mmcsd1_dma_mask,
@@ -235,6 +235,7 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config)
                         mmcsd1_resources[0].end = DM365_MMCSD1_BASE +
                                                         SZ_4K - 1;
                         mmcsd1_resources[2].start = IRQ_DM365_SDIOINT1;
+                        davinci_mmcsd1_device.name = "da830-mmc";
                 } else
                         break;
 
@@ -256,6 +257,7 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config)
                         mmcsd0_resources[0].end = DM365_MMCSD0_BASE +
                                                         SZ_4K - 1;
                         mmcsd0_resources[2].start = IRQ_DM365_SDIOINT0;
+                        davinci_mmcsd0_device.name = "da830-mmc";
                 } else if (cpu_is_davinci_dm644x()) {
                         /* REVISIT: should this be in board-init code? */
                         /* Power-on 3.3V IO cells */
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index b49c3b77d55e..87e6104f45e6 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -361,8 +361,8 @@ static struct clk_lookup dm355_clks[] = {
         CLK("i2c_davinci.1", NULL, &i2c_clk),
         CLK("davinci-mcbsp.0", NULL, &asp0_clk),
         CLK("davinci-mcbsp.1", NULL, &asp1_clk),
-        CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
-        CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
+        CLK("dm6441-mmc.0", NULL, &mmcsd0_clk),
+        CLK("dm6441-mmc.1", NULL, &mmcsd1_clk),
         CLK("spi_davinci.0", NULL, &spi0_clk),
         CLK("spi_davinci.1", NULL, &spi1_clk),
         CLK("spi_davinci.2", NULL, &spi2_clk),
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 6c3980540be0..2791df9187b3 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -454,8 +454,8 @@ static struct clk_lookup dm365_clks[] = {
         CLK(NULL, "uart0", &uart0_clk),
         CLK(NULL, "uart1", &uart1_clk),
         CLK("i2c_davinci.1", NULL, &i2c_clk),
-        CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
-        CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
+        CLK("da830-mmc.0", NULL, &mmcsd0_clk),
+        CLK("da830-mmc.1", NULL, &mmcsd1_clk),
         CLK("spi_davinci.0", NULL, &spi0_clk),
         CLK("spi_davinci.1", NULL, &spi1_clk),
         CLK("spi_davinci.2", NULL, &spi2_clk),
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index db1dd92e00af..ab6bf54c65c7 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -310,7 +310,7 @@ static struct clk_lookup dm644x_clks[] = {
         CLK("i2c_davinci.1", NULL, &i2c_clk),
         CLK("palm_bk3710", NULL, &ide_clk),
         CLK("davinci-mcbsp", NULL, &asp_clk),
-        CLK("davinci_mmc.0", NULL, &mmcsd_clk),
+        CLK("dm6441-mmc.0", NULL, &mmcsd_clk),
         CLK(NULL, "spi", &spi_clk),
         CLK(NULL, "gpio", &gpio_clk),
         CLK(NULL, "usb", &usb_clk),
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index de439b7b9af1..be77ce269cb0 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -55,6 +55,7 @@ extern unsigned int da850_max_speed;
 #define DA8XX_SYSCFG0_VIRT(x)   (da8xx_syscfg0_base + (x))
 #define DA8XX_JTAG_ID_REG       0x18
 #define DA8XX_CFGCHIP0_REG      0x17c
+#define DA8XX_CFGCHIP1_REG      0x180
 #define DA8XX_CFGCHIP2_REG      0x184
 #define DA8XX_CFGCHIP3_REG      0x188
 
diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S
index 34290d14754b..b18b8ebc6508 100644
--- a/arch/arm/mach-davinci/include/mach/debug-macro.S
+++ b/arch/arm/mach-davinci/include/mach/debug-macro.S
@@ -24,8 +24,6 @@
 
 #if defined(CONFIG_DEBUG_DAVINCI_DMx_UART0)
 #define UART_BASE       DAVINCI_UART0_BASE
-#elif defined(CONFIG_DEBUG_DAVINCI_DA8XX_UART0)
-#define UART_BASE       DA8XX_UART0_BASE
 #elif defined(CONFIG_DEBUG_DAVINCI_DA8XX_UART1)
 #define UART_BASE       DA8XX_UART1_BASE
 #elif defined(CONFIG_DEBUG_DAVINCI_DA8XX_UART2)
diff --git a/arch/arm/mach-davinci/tnetv107x.c b/arch/arm/mach-davinci/tnetv107x.c
index dc1a209b9b66..3b2a70d43efa 100644
--- a/arch/arm/mach-davinci/tnetv107x.c
+++ b/arch/arm/mach-davinci/tnetv107x.c
@@ -272,7 +272,7 @@ static struct clk_lookup clks[] = {
         CLK("tnetv107x-keypad.0", NULL,                 &clk_keypad),
         CLK(NULL,               "clk_gpio",             &clk_gpio),
         CLK(NULL,               "clk_mdio",             &clk_mdio),
-        CLK("davinci_mmc.0",    NULL,                   &clk_sdio0),
+        CLK("dm6441-mmc.0",     NULL,                   &clk_sdio0),
         CLK(NULL,               "uart0",                &clk_uart0),
         CLK(NULL,               "uart1",                &clk_uart1),
         CLK(NULL,               "timer0",               &clk_timer0),
@@ -292,7 +292,7 @@ static struct clk_lookup clks[] = {
         CLK(NULL,               "clk_system",           &clk_system),
         CLK(NULL,               "clk_imcop",            &clk_imcop),
         CLK(NULL,               "clk_spare",            &clk_spare),
-        CLK("davinci_mmc.1",    NULL,                   &clk_sdio1),
+        CLK("dm6441-mmc.1",     NULL,                   &clk_sdio1),
         CLK(NULL,               "clk_ddr2_vrst",        &clk_ddr2_vrst),
         CLK(NULL,               "clk_ddr2_vctl_rst",    &clk_ddr2_vctl_rst),
         CLK(NULL,               NULL,                   NULL),