diff mbox

[v3,2/3] davinci: vpss: dm365: set vpss clk ctrl

Message ID 1354100134-21095-3-git-send-email-prabhakar.lad@ti.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Lad, Prabhakar Nov. 28, 2012, 10:55 a.m. UTC 
From: Manjunath Hadli <manjunath.hadli@ti.com>

request_mem_region for VPSS_CLK_CTRL register and ioremap.
and enable clocks appropriately.

Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
---
 drivers/media/platform/davinci/vpss.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

Comments

Sakari Ailus Nov. 28, 2012, 8:18 p.m. UTC | #1 
Hi Prabhakar,

On Wed, Nov 28, 2012 at 04:25:33PM +0530, Prabhakar Lad wrote:
> From: Manjunath Hadli <manjunath.hadli@ti.com>
> 
> request_mem_region for VPSS_CLK_CTRL register and ioremap.
> and enable clocks appropriately.
> 
> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
> ---
>  drivers/media/platform/davinci/vpss.c |   14 ++++++++++++++
>  1 files changed, 14 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
> index 34ad7bd..a36d694 100644
> --- a/drivers/media/platform/davinci/vpss.c
> +++ b/drivers/media/platform/davinci/vpss.c
> @@ -103,6 +103,7 @@ struct vpss_hw_ops {
>  struct vpss_oper_config {
>  	__iomem void *vpss_regs_base0;
>  	__iomem void *vpss_regs_base1;
> +	resource_size_t *vpss_regs_base2;
>  	enum vpss_platform_type platform;
>  	spinlock_t vpss_lock;
>  	struct vpss_hw_ops hw_ops;
> @@ -484,11 +485,24 @@ static struct platform_driver vpss_driver = {
>  
>  static void vpss_exit(void)
>  {
> +	iounmap(oper_cfg.vpss_regs_base2);
> +	release_mem_region(*oper_cfg.vpss_regs_base2, 4);

release_mem_region(VPSS_CLK_CTRL, 4);?

>  	platform_driver_unregister(&vpss_driver);
>  }
>  
> +#define VPSS_CLK_CTRL			0x01c40044
> +#define VPSS_CLK_CTRL_VENCCLKEN		BIT(3)
> +#define VPSS_CLK_CTRL_DACCLKEN		BIT(4)
> +
>  static int __init vpss_init(void)
>  {
> +	if (request_mem_region(VPSS_CLK_CTRL, 4, "vpss_clock_control")) {

if (!request_mem_region())
	return -EBUSY;

...

> +		oper_cfg.vpss_regs_base2 = ioremap(VPSS_CLK_CTRL, 4);
> +		__raw_writel(VPSS_CLK_CTRL_VENCCLKEN |
> +			     VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2);
> +	} else {
> +		return -EBUSY;
> +	}
>  	return platform_driver_register(&vpss_driver);
>  }
>  subsys_initcall(vpss_init);
Lad, Prabhakar Nov. 29, 2012, 1:38 a.m. UTC | #2 
Hi Sakari,

Thanks for the quick review.

On Thu, Nov 29, 2012 at 1:48 AM, Sakari Ailus <sakari.ailus@iki.fi> wrote:
> Hi Prabhakar,
>
> On Wed, Nov 28, 2012 at 04:25:33PM +0530, Prabhakar Lad wrote:
>> From: Manjunath Hadli <manjunath.hadli@ti.com>
>>
>> request_mem_region for VPSS_CLK_CTRL register and ioremap.
>> and enable clocks appropriately.
>>
>> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
>> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
>> ---
>>  drivers/media/platform/davinci/vpss.c |   14 ++++++++++++++
>>  1 files changed, 14 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
>> index 34ad7bd..a36d694 100644
>> --- a/drivers/media/platform/davinci/vpss.c
>> +++ b/drivers/media/platform/davinci/vpss.c
>> @@ -103,6 +103,7 @@ struct vpss_hw_ops {
>>  struct vpss_oper_config {
>>       __iomem void *vpss_regs_base0;
>>       __iomem void *vpss_regs_base1;
>> +     resource_size_t *vpss_regs_base2;
>>       enum vpss_platform_type platform;
>>       spinlock_t vpss_lock;
>>       struct vpss_hw_ops hw_ops;
>> @@ -484,11 +485,24 @@ static struct platform_driver vpss_driver = {
>>
>>  static void vpss_exit(void)
>>  {
>> +     iounmap(oper_cfg.vpss_regs_base2);
>> +     release_mem_region(*oper_cfg.vpss_regs_base2, 4);
>
> release_mem_region(VPSS_CLK_CTRL, 4);?
>
Ok.

>>       platform_driver_unregister(&vpss_driver);
>>  }
>>
>> +#define VPSS_CLK_CTRL                        0x01c40044
>> +#define VPSS_CLK_CTRL_VENCCLKEN              BIT(3)
>> +#define VPSS_CLK_CTRL_DACCLKEN               BIT(4)
>> +
>>  static int __init vpss_init(void)
>>  {
>> +     if (request_mem_region(VPSS_CLK_CTRL, 4, "vpss_clock_control")) {
>
> if (!request_mem_region())
>         return -EBUSY;
>
Ok makes sense returning early on failure.

Regards,
--Prabhakar

> ...
>
>> +             oper_cfg.vpss_regs_base2 = ioremap(VPSS_CLK_CTRL, 4);
>> +             __raw_writel(VPSS_CLK_CTRL_VENCCLKEN |
>> +                          VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2);
>> +     } else {
>> +             return -EBUSY;
>> +     }
>>       return platform_driver_register(&vpss_driver);
>>  }
>>  subsys_initcall(vpss_init);
>
> --
> Sakari Ailus
> e-mail: sakari.ailus@iki.fi     XMPP: sailus@retiisi.org.uk
diff mbox

Patch

diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
index 34ad7bd..a36d694 100644
--- a/drivers/media/platform/davinci/vpss.c
+++ b/drivers/media/platform/davinci/vpss.c
@@ -103,6 +103,7 @@  struct vpss_hw_ops {
 struct vpss_oper_config {
 	__iomem void *vpss_regs_base0;
 	__iomem void *vpss_regs_base1;
+	resource_size_t *vpss_regs_base2;
 	enum vpss_platform_type platform;
 	spinlock_t vpss_lock;
 	struct vpss_hw_ops hw_ops;
@@ -484,11 +485,24 @@  static struct platform_driver vpss_driver = {
 
 static void vpss_exit(void)
 {
+	iounmap(oper_cfg.vpss_regs_base2);
+	release_mem_region(*oper_cfg.vpss_regs_base2, 4);
 	platform_driver_unregister(&vpss_driver);
 }
 
+#define VPSS_CLK_CTRL			0x01c40044
+#define VPSS_CLK_CTRL_VENCCLKEN		BIT(3)
+#define VPSS_CLK_CTRL_DACCLKEN		BIT(4)
+
 static int __init vpss_init(void)
 {
+	if (request_mem_region(VPSS_CLK_CTRL, 4, "vpss_clock_control")) {
+		oper_cfg.vpss_regs_base2 = ioremap(VPSS_CLK_CTRL, 4);
+		__raw_writel(VPSS_CLK_CTRL_VENCCLKEN |
+			     VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2);
+	} else {
+		return -EBUSY;
+	}
 	return platform_driver_register(&vpss_driver);
 }
 subsys_initcall(vpss_init);