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

By default the VPSS clocks were enabled in capture driver
for davinci family which creates duplicates for dm355/dm365/dm644x.
This patch adds support to enable the VPSS clocks in VPSS driver,
which avoids duplication of code and also adding clock aliases.
This patch uses PM runtime API to enable/disable clock, instead
of DaVinci clock framework. con_ids for master and slave clocks of
vpss is added in pm_domain.
This patch cleanups the VPSS clock enabling in the capture driver,
and also removes the clock alias in machine file. Along side adds
a vpss slave clock for DM365 as mentioned by Sekhar
(https://patchwork.kernel.org/patch/1221261/).
The Suspend/Resume in dm644x_ccdc.c which enabled/disabled the VPSS clock
is now implemented as part of the VPSS driver.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

4 files changed, 13 insertions, 16 deletions

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index b49c3b77d55e..8e98bb06b1c1 100644
--- 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);
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 6c3980540be0..c61dd94daadc 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -257,6 +257,12 @@ static struct clk vpss_master_clk = {
         .flags          = CLK_PSC,
 };
 
+static struct clk vpss_slave_clk = {
+        .name           = "vpss_slave",
+        .parent         = &pll1_sysclk5,
+        .lpsc           = DAVINCI_LPSC_VPSSSLV,
+};
+
 static struct clk arm_clk = {
         .name           = "arm_clk",
         .parent         = &pll2_sysclk2,
@@ -449,7 +455,8 @@ static struct clk_lookup dm365_clks[] = {
         CLK(NULL, "pll2_sysclk8", &pll2_sysclk8),
         CLK(NULL, "pll2_sysclk9", &pll2_sysclk9),
         CLK(NULL, "vpss_dac", &vpss_dac_clk),
-        CLK(NULL, "vpss_master", &vpss_master_clk),
+        CLK("vpss", "master", &vpss_master_clk),
+        CLK("vpss", "slave", &vpss_slave_clk),
         CLK(NULL, "arm", &arm_clk),
         CLK(NULL, "uart0", &uart0_clk),
         CLK(NULL, "uart1", &uart1_clk),
@@ -1239,8 +1246,6 @@ static int __init dm365_init_devices(void)
         clk_add_alias(NULL, dev_name(&dm365_mdio_device.dev),
                       NULL, &dm365_emac_device.dev);
 
-        /* Add isif clock alias */
-        clk_add_alias("master", dm365_isif_dev.name, "vpss_master", NULL);
         platform_device_register(&dm365_vpss_device);
         platform_device_register(&dm365_isif_dev);
         platform_device_register(&vpfe_capture_dev);
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index ee0e994748e0..c2a9273330bf 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -300,8 +300,8 @@ static struct clk_lookup dm644x_clks[] = {
         CLK(NULL, "dsp", &dsp_clk),
         CLK(NULL, "arm", &arm_clk),
         CLK(NULL, "vicp", &vicp_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, "arm", &arm_clk),
         CLK(NULL, "uart0", &uart0_clk),
         CLK(NULL, "uart1", &uart1_clk),
@@ -901,11 +901,6 @@ int __init dm644x_init_video(struct vpfe_config *vpfe_cfg,
                 dm644x_vpfe_dev.dev.platform_data = vpfe_cfg;
                 platform_device_register(&dm644x_ccdc_dev);
                 platform_device_register(&dm644x_vpfe_dev);
-                /* 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);
         }
 
         if (vpbe_cfg) {
diff --git a/arch/arm/mach-davinci/pm_domain.c b/arch/arm/mach-davinci/pm_domain.c
index c90250e3bef8..6b98413cebd6 100644
--- a/arch/arm/mach-davinci/pm_domain.c
+++ b/arch/arm/mach-davinci/pm_domain.c
@@ -53,7 +53,7 @@ static struct dev_pm_domain davinci_pm_domain = {
 
 static struct pm_clk_notifier_block platform_bus_notifier = {
         .pm_domain = &davinci_pm_domain,
-        .con_ids = { "fck", NULL, },
+        .con_ids = { "fck", "master", "slave", NULL },
 };
 
 static int __init davinci_pm_runtime_init(void)