linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH V4] ARM: EXYNOS5: Add bus clock and set parent clock for FIMD
  2012-09-17 14:43 [PATCH V4] ARM: EXYNOS5: Add bus clock and set parent clock for FIMD Leela Krishna Amudala
@ 2012-09-17 10:05 ` Jingoo Han
  2012-09-17 10:37   ` Kukjin Kim
  0 siblings, 1 reply; 4+ messages in thread
From: Jingoo Han @ 2012-09-17 10:05 UTC (permalink / raw)
  To: linux-arm-kernel

On Monday, September 17, 2012 11:43 PM Leela Krishna Amudala wrote
> 
> This patch adds the bus clock for FIMD and changes the device name for lcd clock
> also sets mout_mpll_user as parent clock to fimd
> 
> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>

Acked-by: Jingoo Han <jg1.han@samsung.com>

It looks good.


> ---
>  arch/arm/mach-exynos/clock-exynos5.c |   35 ++++++++++++++++++++++++---------
>  arch/arm/mach-exynos/clock-exynos5.h |   17 ++++++++++++++++
>  2 files changed, 42 insertions(+), 10 deletions(-)
>  create mode 100644 arch/arm/mach-exynos/clock-exynos5.h
> 
> diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c
> index 774533c..0f6ff97 100644
> --- a/arch/arm/mach-exynos/clock-exynos5.c
> +++ b/arch/arm/mach-exynos/clock-exynos5.c
> @@ -27,6 +27,7 @@
>  #include <mach/sysmmu.h>
> 
>  #include "common.h"
> +#include "clock-exynos5.h"
> 
>  #ifdef CONFIG_PM_SLEEP
>  static struct sleep_save exynos5_clock_save[] = {
> @@ -891,6 +892,13 @@ static struct clk exynos5_clk_mdma1 = {
>  	.ctrlbit	= (1 << 4),
>  };
> 
> +static struct clk exynos5_clk_fimd1 = {
> +	.name		= "fimd",
> +	.devname	= "exynos5-fb.1",
> +	.enable		= exynos5_clk_ip_disp1_ctrl,
> +	.ctrlbit	= (1 << 0),
> +};
> +
>  struct clk *exynos5_clkset_group_list[] = {
>  	[0] = &clk_ext_xtal_mux,
>  	[1] = NULL,
> @@ -1120,6 +1128,18 @@ static struct clksrc_clk exynos5_clk_sclk_spi2 = {
>  	.reg_div = { .reg = EXYNOS5_CLKDIV_PERIC2, .shift = 8, .size = 8 },
>  };
> 
> +struct clksrc_clk exynos5_clk_sclk_fimd1 = {
> +	.clk	= {
> +		.name		= "sclk_fimd",
> +		.devname	= "exynos5-fb.1",
> +		.enable		= exynos5_clksrc_mask_disp1_0_ctrl,
> +		.ctrlbit	= (1 << 0),
> +	},
> +	.sources = &exynos5_clkset_group,
> +	.reg_src = { .reg = EXYNOS5_CLKSRC_DISP1_0, .shift = 0, .size = 4 },
> +	.reg_div = { .reg = EXYNOS5_CLKDIV_DISP1_0, .shift = 0, .size = 4 },
> +};
> +
>  static struct clksrc_clk exynos5_clksrcs[] = {
>  	{
>  		.clk	= {
> @@ -1131,16 +1151,6 @@ static struct clksrc_clk exynos5_clksrcs[] = {
>  		.reg_div = { .reg = EXYNOS5_CLKDIV_FSYS3, .shift = 8, .size = 8 },
>  	}, {
>  		.clk	= {
> -			.name		= "sclk_fimd",
> -			.devname	= "s3cfb.1",
> -			.enable		= exynos5_clksrc_mask_disp1_0_ctrl,
> -			.ctrlbit	= (1 << 0),
> -		},
> -		.sources = &exynos5_clkset_group,
> -		.reg_src = { .reg = EXYNOS5_CLKSRC_DISP1_0, .shift = 0, .size = 4 },
> -		.reg_div = { .reg = EXYNOS5_CLKDIV_DISP1_0, .shift = 0, .size = 4 },
> -	}, {
> -		.clk	= {
>  			.name		= "aclk_266_gscl",
>  		},
>  		.sources = &clk_src_gscl_266,
> @@ -1240,12 +1250,14 @@ static struct clksrc_clk *exynos5_sysclks[] = {
>  	&exynos5_clk_mdout_spi0,
>  	&exynos5_clk_mdout_spi1,
>  	&exynos5_clk_mdout_spi2,
> +	&exynos5_clk_sclk_fimd1,
>  };
> 
>  static struct clk *exynos5_clk_cdev[] = {
>  	&exynos5_clk_pdma0,
>  	&exynos5_clk_pdma1,
>  	&exynos5_clk_mdma1,
> +	&exynos5_clk_fimd1,
>  };
> 
>  static struct clksrc_clk *exynos5_clksrc_cdev[] = {
> @@ -1274,6 +1286,7 @@ static struct clk_lookup exynos5_clk_lookup[] = {
>  	CLKDEV_INIT("dma-pl330.0", "apb_pclk", &exynos5_clk_pdma0),
>  	CLKDEV_INIT("dma-pl330.1", "apb_pclk", &exynos5_clk_pdma1),
>  	CLKDEV_INIT("dma-pl330.2", "apb_pclk", &exynos5_clk_mdma1),
> +	CLKDEV_INIT("exynos5-fb.1", "lcd", &exynos5_clk_fimd1),
>  };
> 
>  static unsigned long exynos5_epll_get_rate(struct clk *clk)
> @@ -1492,6 +1505,8 @@ void __init_or_cpufreq exynos5_setup_clocks(void)
> 
>  	clk_set_rate(&exynos5_clk_aclk_acp.clk, 267000000);
>  	clk_set_rate(&exynos5_clk_pclk_acp.clk, 134000000);
> +	clk_set_parent(&exynos5_clk_sclk_fimd1.clk,
> +			&exynos5_clk_mout_mpll_user.clk);
> 
>  	for (ptr = 0; ptr < ARRAY_SIZE(exynos5_clksrcs); ptr++)
>  		s3c_set_clksrc(&exynos5_clksrcs[ptr], true);
> diff --git a/arch/arm/mach-exynos/clock-exynos5.h b/arch/arm/mach-exynos/clock-exynos5.h
> new file mode 100644
> index 0000000..6f78f5d
> --- /dev/null
> +++ b/arch/arm/mach-exynos/clock-exynos5.h
> @@ -0,0 +1,17 @@
> +/*
> + * Copyright (c) 2012 Samsung Electronics Co., Ltd.
> + *		http://www.samsung.com
> + *
> + * Header file for exynos5 clock support
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> +*/
> +
> +#ifndef __ASM_ARCH_EXYNOS5_CLOCK_H
> +#define __ASM_ARCH_EXYNOS5_CLOCK_H __FILE__
> +
> +extern struct clksrc_clk exynos5_clk_sclk_fimd1;
> +
> +#endif /* __ASM_ARCH_EXYNOS5_CLOCK_H */
> --
> 1.7.0.4

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH V4] ARM: EXYNOS5: Add bus clock and set parent clock for FIMD
  2012-09-17 10:05 ` Jingoo Han
@ 2012-09-17 10:37   ` Kukjin Kim
  2012-09-20  1:28     ` Jingoo Han
  0 siblings, 1 reply; 4+ messages in thread
From: Kukjin Kim @ 2012-09-17 10:37 UTC (permalink / raw)
  To: linux-arm-kernel

Jingoo Han wrote:
> 
> On Monday, September 17, 2012 11:43 PM Leela Krishna Amudala wrote
> >
> > This patch adds the bus clock for FIMD and changes the device name for
> lcd clock
> > also sets mout_mpll_user as parent clock to fimd
> >
> > Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
> 
> Acked-by: Jingoo Han <jg1.han@samsung.com>
> 
In this case, since Leela addressed comments from you, seems it should be
'Reviewed-by'?

> It looks good.
> 
> 
> > ---
> >  arch/arm/mach-exynos/clock-exynos5.c |   35
++++++++++++++++++++++++----
> -----
> >  arch/arm/mach-exynos/clock-exynos5.h |   17 ++++++++++++++++
> >  2 files changed, 42 insertions(+), 10 deletions(-)
> >  create mode 100644 arch/arm/mach-exynos/clock-exynos5.h

[snip]

> >  	clk_set_rate(&exynos5_clk_aclk_acp.clk, 267000000);
> >  	clk_set_rate(&exynos5_clk_pclk_acp.clk, 134000000);
> > +	clk_set_parent(&exynos5_clk_sclk_fimd1.clk,
> > +			&exynos5_clk_mout_mpll_user.clk);

Well, do we _really_ need to set same parent clock for fimd1 here on all of
exynos5? I don't think so.

> >
> >  	for (ptr = 0; ptr < ARRAY_SIZE(exynos5_clksrcs); ptr++)
> >  		s3c_set_clksrc(&exynos5_clksrcs[ptr], true);
> > diff --git a/arch/arm/mach-exynos/clock-exynos5.h b/arch/arm/mach-
> exynos/clock-exynos5.h
> > new file mode 100644
> > index 0000000..6f78f5d
> > --- /dev/null
> > +++ b/arch/arm/mach-exynos/clock-exynos5.h
> > @@ -0,0 +1,17 @@
> > +/*
> > + * Copyright (c) 2012 Samsung Electronics Co., Ltd.
> > + *		http://www.samsung.com
> > + *
> > + * Header file for exynos5 clock support
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > +*/
> > +
> > +#ifndef __ASM_ARCH_EXYNOS5_CLOCK_H
> > +#define __ASM_ARCH_EXYNOS5_CLOCK_H __FILE__
> > +
> > +extern struct clksrc_clk exynos5_clk_sclk_fimd1;
> > +

I don't have any idea why we need this.

Note, the 'clock-exynos4.h' is for supporting common exynos4 and specific
exynos4210 and exynos4x12.

[snip]

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH V4] ARM: EXYNOS5: Add bus clock and set parent clock for FIMD
@ 2012-09-17 14:43 Leela Krishna Amudala
  2012-09-17 10:05 ` Jingoo Han
  0 siblings, 1 reply; 4+ messages in thread
From: Leela Krishna Amudala @ 2012-09-17 14:43 UTC (permalink / raw)
  To: linux-arm-kernel

This patch adds the bus clock for FIMD and changes the device name for lcd clock
also sets mout_mpll_user as parent clock to fimd

Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
---
 arch/arm/mach-exynos/clock-exynos5.c |   35 ++++++++++++++++++++++++---------
 arch/arm/mach-exynos/clock-exynos5.h |   17 ++++++++++++++++
 2 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 arch/arm/mach-exynos/clock-exynos5.h

diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c
index 774533c..0f6ff97 100644
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@ -27,6 +27,7 @@
 #include <mach/sysmmu.h>
 
 #include "common.h"
+#include "clock-exynos5.h"
 
 #ifdef CONFIG_PM_SLEEP
 static struct sleep_save exynos5_clock_save[] = {
@@ -891,6 +892,13 @@ static struct clk exynos5_clk_mdma1 = {
 	.ctrlbit	= (1 << 4),
 };
 
+static struct clk exynos5_clk_fimd1 = {
+	.name		= "fimd",
+	.devname	= "exynos5-fb.1",
+	.enable		= exynos5_clk_ip_disp1_ctrl,
+	.ctrlbit	= (1 << 0),
+};
+
 struct clk *exynos5_clkset_group_list[] = {
 	[0] = &clk_ext_xtal_mux,
 	[1] = NULL,
@@ -1120,6 +1128,18 @@ static struct clksrc_clk exynos5_clk_sclk_spi2 = {
 	.reg_div = { .reg = EXYNOS5_CLKDIV_PERIC2, .shift = 8, .size = 8 },
 };
 
+struct clksrc_clk exynos5_clk_sclk_fimd1 = {
+	.clk	= {
+		.name		= "sclk_fimd",
+		.devname	= "exynos5-fb.1",
+		.enable		= exynos5_clksrc_mask_disp1_0_ctrl,
+		.ctrlbit	= (1 << 0),
+	},
+	.sources = &exynos5_clkset_group,
+	.reg_src = { .reg = EXYNOS5_CLKSRC_DISP1_0, .shift = 0, .size = 4 },
+	.reg_div = { .reg = EXYNOS5_CLKDIV_DISP1_0, .shift = 0, .size = 4 },
+};
+
 static struct clksrc_clk exynos5_clksrcs[] = {
 	{
 		.clk	= {
@@ -1131,16 +1151,6 @@ static struct clksrc_clk exynos5_clksrcs[] = {
 		.reg_div = { .reg = EXYNOS5_CLKDIV_FSYS3, .shift = 8, .size = 8 },
 	}, {
 		.clk	= {
-			.name		= "sclk_fimd",
-			.devname	= "s3cfb.1",
-			.enable		= exynos5_clksrc_mask_disp1_0_ctrl,
-			.ctrlbit	= (1 << 0),
-		},
-		.sources = &exynos5_clkset_group,
-		.reg_src = { .reg = EXYNOS5_CLKSRC_DISP1_0, .shift = 0, .size = 4 },
-		.reg_div = { .reg = EXYNOS5_CLKDIV_DISP1_0, .shift = 0, .size = 4 },
-	}, {
-		.clk	= {
 			.name		= "aclk_266_gscl",
 		},
 		.sources = &clk_src_gscl_266,
@@ -1240,12 +1250,14 @@ static struct clksrc_clk *exynos5_sysclks[] = {
 	&exynos5_clk_mdout_spi0,
 	&exynos5_clk_mdout_spi1,
 	&exynos5_clk_mdout_spi2,
+	&exynos5_clk_sclk_fimd1,
 };
 
 static struct clk *exynos5_clk_cdev[] = {
 	&exynos5_clk_pdma0,
 	&exynos5_clk_pdma1,
 	&exynos5_clk_mdma1,
+	&exynos5_clk_fimd1,
 };
 
 static struct clksrc_clk *exynos5_clksrc_cdev[] = {
@@ -1274,6 +1286,7 @@ static struct clk_lookup exynos5_clk_lookup[] = {
 	CLKDEV_INIT("dma-pl330.0", "apb_pclk", &exynos5_clk_pdma0),
 	CLKDEV_INIT("dma-pl330.1", "apb_pclk", &exynos5_clk_pdma1),
 	CLKDEV_INIT("dma-pl330.2", "apb_pclk", &exynos5_clk_mdma1),
+	CLKDEV_INIT("exynos5-fb.1", "lcd", &exynos5_clk_fimd1),
 };
 
 static unsigned long exynos5_epll_get_rate(struct clk *clk)
@@ -1492,6 +1505,8 @@ void __init_or_cpufreq exynos5_setup_clocks(void)
 
 	clk_set_rate(&exynos5_clk_aclk_acp.clk, 267000000);
 	clk_set_rate(&exynos5_clk_pclk_acp.clk, 134000000);
+	clk_set_parent(&exynos5_clk_sclk_fimd1.clk,
+			&exynos5_clk_mout_mpll_user.clk);
 
 	for (ptr = 0; ptr < ARRAY_SIZE(exynos5_clksrcs); ptr++)
 		s3c_set_clksrc(&exynos5_clksrcs[ptr], true);
diff --git a/arch/arm/mach-exynos/clock-exynos5.h b/arch/arm/mach-exynos/clock-exynos5.h
new file mode 100644
index 0000000..6f78f5d
--- /dev/null
+++ b/arch/arm/mach-exynos/clock-exynos5.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * Header file for exynos5 clock support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_ARCH_EXYNOS5_CLOCK_H
+#define __ASM_ARCH_EXYNOS5_CLOCK_H __FILE__
+
+extern struct clksrc_clk exynos5_clk_sclk_fimd1;
+
+#endif /* __ASM_ARCH_EXYNOS5_CLOCK_H */
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH V4] ARM: EXYNOS5: Add bus clock and set parent clock for FIMD
  2012-09-17 10:37   ` Kukjin Kim
@ 2012-09-20  1:28     ` Jingoo Han
  0 siblings, 0 replies; 4+ messages in thread
From: Jingoo Han @ 2012-09-20  1:28 UTC (permalink / raw)
  To: linux-arm-kernel

On Monday, September 17, 2012 7:37 PM Kukjin Kim wrote
> 
> Jingoo Han wrote:
> >
> > On Monday, September 17, 2012 11:43 PM Leela Krishna Amudala wrote
> > >
> > > This patch adds the bus clock for FIMD and changes the device name for
> > lcd clock
> > > also sets mout_mpll_user as parent clock to fimd
> > >
> > > Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
> >
> > Acked-by: Jingoo Han <jg1.han@samsung.com>
> >
> In this case, since Leela addressed comments from you, seems it should be
> 'Reviewed-by'?
> 

According to 'Documentation/SubmittingPatches',

402 Acked-by: is often used by the maintainer of the affected code when that
403 maintainer neither contributed to nor forwarded the patch.

I just use 'Acked-by' as Samsung Framebuffer maintainer, because
this patch affects Samsung Framebuffer driver directly.

Good luck.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-09-20  1:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-17 14:43 [PATCH V4] ARM: EXYNOS5: Add bus clock and set parent clock for FIMD Leela Krishna Amudala
2012-09-17 10:05 ` Jingoo Han
2012-09-17 10:37   ` Kukjin Kim
2012-09-20  1:28     ` Jingoo Han

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).