[media] media: davinci: vpss: enable vpss clocks

[pandora-kernel.git] / arch / arm / mach-davinci / dm355.c

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index b49c3b7..8e98bb0 100644 (file)
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -345,8 +345,8 @@ static struct clk_lookup dm355_clks[] = {
        CLK(NULL, "pll1_aux", &pll1_aux_clk),
        CLK(NULL, "pll1_sysclkbp", &pll1_sysclkbp),
        CLK(NULL, "vpss_dac", &vpss_dac_clk),
-       CLK(NULL, "vpss_master", &vpss_master_clk),
-       CLK(NULL, "vpss_slave", &vpss_slave_clk),
+       CLK("vpss", "master", &vpss_master_clk),
+       CLK("vpss", "slave", &vpss_slave_clk),
        CLK(NULL, "clkout1", &clkout1_clk),
        CLK(NULL, "clkout2", &clkout2_clk),
        CLK(NULL, "pll2", &pll2_clk),
@@ -873,9 +873,6 @@ static int __init dm355_init_devices(void)
        if (!cpu_is_davinci_dm355())
                return 0;
 
-       /* Add ccdc clock aliases */
-       clk_add_alias("master", dm355_ccdc_dev.name, "vpss_master", NULL);
-       clk_add_alias("slave", dm355_ccdc_dev.name, "vpss_master", NULL);
        davinci_cfg_reg(DM355_INT_EDMA_CC);
        platform_device_register(&dm355_edma_device);
        platform_device_register(&dm355_vpss_device);