Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a3e89b1 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 407ccc65

arch/arm/mach-davinci/dm355.c

+2 −5
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-davinci/dm365.c

+8 −3
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-davinci/dm644x.c

+2 −7
Original line number Diff line number Diff line
@@ -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) {

arch/arm/mach-davinci/pm_domain.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/media/platform/davinci/dm355_ccdc.c

+1 −38
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <linux/platform_device.h>

#include <linux/uaccess.h>

#include <linux/videodev2.h>

#include <linux/clk.h>

#include <linux/err.h>

#include <linux/module.h>
@@ -59,10 +58,6 @@ static struct ccdc_oper_config { 
	struct ccdc_params_raw bayer;

	/* YCbCr configuration */

	struct ccdc_params_ycbcr ycbcr;

	/* Master clock */

	struct clk *mclk;

	/* slave clock */

	struct clk *sclk;

	/* ccdc base address */

	void __iomem *base_addr;

} ccdc_cfg = {
@@ -997,32 +992,10 @@ static int dm355_ccdc_probe(struct platform_device *pdev) 
		goto fail_nomem;

	}



	/* Get and enable Master clock */

	ccdc_cfg.mclk = clk_get(&pdev->dev, "master");

	if (IS_ERR(ccdc_cfg.mclk)) {

		status = PTR_ERR(ccdc_cfg.mclk);

		goto fail_nomap;

	}

	if (clk_prepare_enable(ccdc_cfg.mclk)) {

		status = -ENODEV;

		goto fail_mclk;

	}



	/* Get and enable Slave clock */

	ccdc_cfg.sclk = clk_get(&pdev->dev, "slave");

	if (IS_ERR(ccdc_cfg.sclk)) {

		status = PTR_ERR(ccdc_cfg.sclk);

		goto fail_mclk;

	}

	if (clk_prepare_enable(ccdc_cfg.sclk)) {

		status = -ENODEV;

		goto fail_sclk;

	}



	/* Platform data holds setup_pinmux function ptr */

	if (NULL == pdev->dev.platform_data) {

		status = -ENODEV;

		goto fail_sclk;

		goto fail_nomap;

	}

	setup_pinmux = pdev->dev.platform_data;

	/*
@@ -1033,12 +1006,6 @@ static int dm355_ccdc_probe(struct platform_device *pdev) 
	ccdc_cfg.dev = &pdev->dev;

	printk(KERN_NOTICE "%s is registered with vpfe.\n", ccdc_hw_dev.name);

	return 0;

fail_sclk:

	clk_disable_unprepare(ccdc_cfg.sclk);

	clk_put(ccdc_cfg.sclk);

fail_mclk:

	clk_disable_unprepare(ccdc_cfg.mclk);

	clk_put(ccdc_cfg.mclk);

fail_nomap:

	iounmap(ccdc_cfg.base_addr);

fail_nomem:
@@ -1052,10 +1019,6 @@ static int dm355_ccdc_remove(struct platform_device *pdev) 
{

	struct resource	*res;



	clk_disable_unprepare(ccdc_cfg.sclk);

	clk_disable_unprepare(ccdc_cfg.mclk);

	clk_put(ccdc_cfg.mclk);

	clk_put(ccdc_cfg.sclk);

	iounmap(ccdc_cfg.base_addr);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res)