diff mbox

[2/3] ARM: EXYNOS: Add clkdev lookup entry for lcd clock

Message ID 1322718611-20934-3-git-send-email-tushar.behera@linaro.org
State Accepted
Headers show

Commit Message

Tushar Behera Dec. 1, 2011, 5:50 a.m. UTC
The framebuffer driver needs the clock named 'lcd' as its bus
clock but the equivalent clock on Exynos4 is named as 'fimd'.
Hence, create a clkdev lookup entry with the name 'lcd' that
references the 'fimd' clock.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
---
 arch/arm/mach-exynos/clock.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

Comments

Tushar Behera Feb. 29, 2012, 5:45 a.m. UTC | #1
Hi Kukjin,

On 12/01/2011 11:20 AM, Tushar Behera wrote:
> The framebuffer driver needs the clock named 'lcd' as its bus
> clock but the equivalent clock on Exynos4 is named as 'fimd'.
> Hence, create a clkdev lookup entry with the name 'lcd' that
> references the 'fimd' clock.
> 
> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> ---
>  arch/arm/mach-exynos/clock.c |   14 +++++++++-----
>  1 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
> index 5d8d483..607ec28 100644
> --- a/arch/arm/mach-exynos/clock.c
> +++ b/arch/arm/mach-exynos/clock.c
> @@ -489,11 +489,6 @@ static struct clk init_clocks_off[] = {
>  		.enable		= exynos4_clk_ip_cam_ctrl,
>  		.ctrlbit	= (1 << 3),
>  	}, {
> -		.name		= "fimd",
> -		.devname	= "exynos4-fb.0",
> -		.enable		= exynos4_clk_ip_lcd0_ctrl,
> -		.ctrlbit	= (1 << 0),
> -	}, {
>  		.name		= "hsmmc",
>  		.devname	= "s3c-sdhci.0",
>  		.parent		= &clk_aclk_133.clk,
> @@ -782,6 +777,13 @@ static struct clk clk_pdma1 = {
>  	.ctrlbit	= (1 << 1),
>  };
>  
> +static struct clk clk_fimd0 = {
> +	.name		= "fimd",
> +	.devname	= "exynos4-fb.0",
> +	.enable		= exynos4_clk_ip_lcd0_ctrl,
> +	.ctrlbit	= (1 << 0),
> +};
> +
>  struct clk *clkset_group_list[] = {
>  	[0] = &clk_ext_xtal_mux,
>  	[1] = &clk_xusbxti,
> @@ -1294,6 +1296,7 @@ static struct clksrc_clk *sysclks[] = {
>  static struct clk *clk_cdev[] = {
>  	&clk_pdma0,
>  	&clk_pdma1,
> +	&clk_fimd0,
>  };
>  
>  static struct clksrc_clk *clksrc_cdev[] = {
> @@ -1318,6 +1321,7 @@ static struct clk_lookup exynos4_clk_lookup[] = {
>  	CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk),
>  	CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0),
>  	CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1),
> +	CLKDEV_INIT("exynos4-fb.0", "lcd", &clk_fimd0),
>  };
>  
>  static int xtal_rate;

Would you please review this patch and let me know your opinion? Without
this patch, frame-buffer support on EXYNOS4 is broken.
Hi Tushar,

On 12/01/2011 06:50 AM, Tushar Behera wrote:
> The framebuffer driver needs the clock named 'lcd' as its bus
> clock but the equivalent clock on Exynos4 is named as 'fimd'.
> Hence, create a clkdev lookup entry with the name 'lcd' that
> references the 'fimd' clock.
> 
> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>

Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

> ---
>  arch/arm/mach-exynos/clock.c |   14 +++++++++-----
>  1 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
> index 5d8d483..607ec28 100644
> --- a/arch/arm/mach-exynos/clock.c
> +++ b/arch/arm/mach-exynos/clock.c
> @@ -489,11 +489,6 @@ static struct clk init_clocks_off[] = {
>  		.enable		= exynos4_clk_ip_cam_ctrl,
>  		.ctrlbit	= (1 << 3),
>  	}, {
> -		.name		= "fimd",
> -		.devname	= "exynos4-fb.0",
> -		.enable		= exynos4_clk_ip_lcd0_ctrl,
> -		.ctrlbit	= (1 << 0),
> -	}, {
>  		.name		= "hsmmc",
>  		.devname	= "s3c-sdhci.0",
>  		.parent		= &clk_aclk_133.clk,
> @@ -782,6 +777,13 @@ static struct clk clk_pdma1 = {
>  	.ctrlbit	= (1 << 1),
>  };
>  
> +static struct clk clk_fimd0 = {
> +	.name		= "fimd",
> +	.devname	= "exynos4-fb.0",
> +	.enable		= exynos4_clk_ip_lcd0_ctrl,
> +	.ctrlbit	= (1 << 0),
> +};
> +
>  struct clk *clkset_group_list[] = {
>  	[0] = &clk_ext_xtal_mux,
>  	[1] = &clk_xusbxti,
> @@ -1294,6 +1296,7 @@ static struct clksrc_clk *sysclks[] = {
>  static struct clk *clk_cdev[] = {
>  	&clk_pdma0,
>  	&clk_pdma1,
> +	&clk_fimd0,
>  };
>  
>  static struct clksrc_clk *clksrc_cdev[] = {
> @@ -1318,6 +1321,7 @@ static struct clk_lookup exynos4_clk_lookup[] = {
>  	CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk),
>  	CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0),
>  	CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1),
> +	CLKDEV_INIT("exynos4-fb.0", "lcd", &clk_fimd0),
>  };
>  
>  static int xtal_rate;

Thanks,
Jingoo Han Feb. 29, 2012, 10:26 a.m. UTC | #3
Hi Tushar,

> -----Original Message-----
> From: linux-samsung-soc-owner@vger.kernel.org [mailto:linux-samsung-soc-owner@vger.kernel.org] On Behalf
> Of Tushar Behera
> Sent: Thursday, December 01, 2011 2:50 PM
> To: linux-samsung-soc@vger.kernel.org
> Cc: kgene.kim@samsung.com; linaro-dev@lists.linaro.org; patches@linaro.org
> Subject: [PATCH 2/3] ARM: EXYNOS: Add clkdev lookup entry for lcd clock
> 
> The framebuffer driver needs the clock named 'lcd' as its bus
> clock but the equivalent clock on Exynos4 is named as 'fimd'.
> Hence, create a clkdev lookup entry with the name 'lcd' that
> references the 'fimd' clock.
> 
> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>

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

I also tested this patch with SMDKV310 board.
It works properly.

Thank you.

> ---
>  arch/arm/mach-exynos/clock.c |   14 +++++++++-----
>  1 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
> index 5d8d483..607ec28 100644
> --- a/arch/arm/mach-exynos/clock.c
> +++ b/arch/arm/mach-exynos/clock.c
> @@ -489,11 +489,6 @@ static struct clk init_clocks_off[] = {
>  		.enable		= exynos4_clk_ip_cam_ctrl,
>  		.ctrlbit	= (1 << 3),
>  	}, {
> -		.name		= "fimd",
> -		.devname	= "exynos4-fb.0",
> -		.enable		= exynos4_clk_ip_lcd0_ctrl,
> -		.ctrlbit	= (1 << 0),
> -	}, {
>  		.name		= "hsmmc",
>  		.devname	= "s3c-sdhci.0",
>  		.parent		= &clk_aclk_133.clk,
> @@ -782,6 +777,13 @@ static struct clk clk_pdma1 = {
>  	.ctrlbit	= (1 << 1),
>  };
> 
> +static struct clk clk_fimd0 = {
> +	.name		= "fimd",
> +	.devname	= "exynos4-fb.0",
> +	.enable		= exynos4_clk_ip_lcd0_ctrl,
> +	.ctrlbit	= (1 << 0),
> +};
> +
>  struct clk *clkset_group_list[] = {
>  	[0] = &clk_ext_xtal_mux,
>  	[1] = &clk_xusbxti,
> @@ -1294,6 +1296,7 @@ static struct clksrc_clk *sysclks[] = {
>  static struct clk *clk_cdev[] = {
>  	&clk_pdma0,
>  	&clk_pdma1,
> +	&clk_fimd0,
>  };
> 
>  static struct clksrc_clk *clksrc_cdev[] = {
> @@ -1318,6 +1321,7 @@ static struct clk_lookup exynos4_clk_lookup[] = {
>  	CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk),
>  	CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0),
>  	CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1),
> +	CLKDEV_INIT("exynos4-fb.0", "lcd", &clk_fimd0),
>  };
> 
>  static int xtal_rate;
> --
> 1.7.4.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kukjin Kim March 1, 2012, 4:06 a.m. UTC | #4
Jingoo Han wrote:
> 
> Hi Tushar,
> 

(please don't top-post)

> > -----Original Message-----
> > From: linux-samsung-soc-owner@vger.kernel.org [mailto:linux-samsung-soc-
> owner@vger.kernel.org] On Behalf
> > Of Tushar Behera
> > Sent: Thursday, December 01, 2011 2:50 PM
> > To: linux-samsung-soc@vger.kernel.org
> > Cc: kgene.kim@samsung.com; linaro-dev@lists.linaro.org;
> patches@linaro.org
> > Subject: [PATCH 2/3] ARM: EXYNOS: Add clkdev lookup entry for lcd clock
> >
> > The framebuffer driver needs the clock named 'lcd' as its bus
> > clock but the equivalent clock on Exynos4 is named as 'fimd'.
> > Hence, create a clkdev lookup entry with the name 'lcd' that
> > references the 'fimd' clock.
> >
> > Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> 
> Acked-by: Jingoo Han <jg1.han@samsung.com>
> 

OK, I will apply this with Sylwester's 'reviewed-by' I looked at  before.

BTW, Tushar, what's the [1/3] and [3/3] in this series? If they are still
needed now, could you please re-send? Maybe I missed.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Tushar Behera March 1, 2012, 4:17 a.m. UTC | #5
Hi Kukjin,

On 03/01/2012 09:36 AM, Kukjin Kim wrote:
> Jingoo Han wrote:
>>
>> Hi Tushar,
>>
> 
> (please don't top-post)
> 
>>> -----Original Message-----
>>> From: linux-samsung-soc-owner@vger.kernel.org [mailto:linux-samsung-soc-
>> owner@vger.kernel.org] On Behalf
>>> Of Tushar Behera
>>> Sent: Thursday, December 01, 2011 2:50 PM
>>> To: linux-samsung-soc@vger.kernel.org
>>> Cc: kgene.kim@samsung.com; linaro-dev@lists.linaro.org;
>> patches@linaro.org
>>> Subject: [PATCH 2/3] ARM: EXYNOS: Add clkdev lookup entry for lcd clock
>>>
>>> The framebuffer driver needs the clock named 'lcd' as its bus
>>> clock but the equivalent clock on Exynos4 is named as 'fimd'.
>>> Hence, create a clkdev lookup entry with the name 'lcd' that
>>> references the 'fimd' clock.
>>>
>>> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
>>
>> Acked-by: Jingoo Han <jg1.han@samsung.com>
>>
> 
> OK, I will apply this with Sylwester's 'reviewed-by' I looked at  before.
> 
Thanks. Do you want me rebase this patch on your latest for-next and resend?

> BTW, Tushar, what's the [1/3] and [3/3] in this series? If they are still
> needed now, could you please re-send? Maybe I missed.
> 
"[PATCH 1/3] ARM: EXYNOS: Increase DMA pool allocator size for framebuffer"
	- It should be dropped.

"[PATCH 3/3] ARM: EXYNOS: Invert VCLK polarity for framebuffer on Origen
board"
	- It has already been applied.


> Thanks.
> 
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>
Kukjin Kim March 1, 2012, 5:15 a.m. UTC | #6
Tushar Behera wrote:
> 
> Hi Kukjin,
> 
Tushar, please don't top-post.

> On 03/01/2012 09:36 AM, Kukjin Kim wrote:
> > Jingoo Han wrote:
> >>
> >> Hi Tushar,
> >>
> >
> > (please don't top-post)
> >
> >>> -----Original Message-----
> >>> From: linux-samsung-soc-owner@vger.kernel.org [mailto:linux-samsung-
> soc-
> >> owner@vger.kernel.org] On Behalf
> >>> Of Tushar Behera
> >>> Sent: Thursday, December 01, 2011 2:50 PM
> >>> To: linux-samsung-soc@vger.kernel.org
> >>> Cc: kgene.kim@samsung.com; linaro-dev@lists.linaro.org;
> >> patches@linaro.org
> >>> Subject: [PATCH 2/3] ARM: EXYNOS: Add clkdev lookup entry for lcd
> clock
> >>>
> >>> The framebuffer driver needs the clock named 'lcd' as its bus
> >>> clock but the equivalent clock on Exynos4 is named as 'fimd'.
> >>> Hence, create a clkdev lookup entry with the name 'lcd' that
> >>> references the 'fimd' clock.
> >>>
> >>> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> >>
> >> Acked-by: Jingoo Han <jg1.han@samsung.com>
> >>
> >
> > OK, I will apply this with Sylwester's 'reviewed-by' I looked at
before.
> >
> Thanks. Do you want me rebase this patch on your latest for-next and
> resend?
> 
Thanks but I can do it.

> > BTW, Tushar, what's the [1/3] and [3/3] in this series? If they are
> still
> > needed now, could you please re-send? Maybe I missed.
> >
> "[PATCH 1/3] ARM: EXYNOS: Increase DMA pool allocator size for
> framebuffer"
> 	- It should be dropped.
> 
> "[PATCH 3/3] ARM: EXYNOS: Invert VCLK polarity for framebuffer on Origen
> board"
> 	- It has already been applied.

OK, thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Kukjin Kim March 9, 2012, 4:08 p.m. UTC | #7
On 02/29/12 21:15, Kukjin Kim wrote:
> Tushar Behera wrote:

[...]

>>>> Acked-by: Jingoo Han<jg1.han@samsung.com>
>>>>
>>>
>>> OK, I will apply this with Sylwester's 'reviewed-by' I looked at
> before.
>>>
>> Thanks. Do you want me rebase this patch on your latest for-next and
>> resend?
>>
> Thanks but I can do it.
>
>>> BTW, Tushar, what's the [1/3] and [3/3] in this series? If they are
>> still
>>> needed now, could you please re-send? Maybe I missed.
>>>
>> "[PATCH 1/3] ARM: EXYNOS: Increase DMA pool allocator size for
>> framebuffer"
>> 	- It should be dropped.
>>
>> "[PATCH 3/3] ARM: EXYNOS: Invert VCLK polarity for framebuffer on Origen
>> board"
>> 	- It has already been applied.
>
> OK, thanks.

Tushar,

As a note, this will be applied on top of new cleanup-exynos-clock.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Chengjie HE March 10, 2012, 2:22 p.m. UTC | #8
I am doing the suspend and resume of s3cfb on exynos. the clk_on and
clk_off just failed. I think this is a related issue.

On 29 February 2012 13:45, Tushar Behera <tushar.behera@linaro.org> wrote:

> Hi Kukjin,
>
> On 12/01/2011 11:20 AM, Tushar Behera wrote:
> > The framebuffer driver needs the clock named 'lcd' as its bus
> > clock but the equivalent clock on Exynos4 is named as 'fimd'.
> > Hence, create a clkdev lookup entry with the name 'lcd' that
> > references the 'fimd' clock.
> >
> > Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> > ---
> >  arch/arm/mach-exynos/clock.c |   14 +++++++++-----
> >  1 files changed, 9 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
> > index 5d8d483..607ec28 100644
> > --- a/arch/arm/mach-exynos/clock.c
> > +++ b/arch/arm/mach-exynos/clock.c
> > @@ -489,11 +489,6 @@ static struct clk init_clocks_off[] = {
> >               .enable         = exynos4_clk_ip_cam_ctrl,
> >               .ctrlbit        = (1 << 3),
> >       }, {
> > -             .name           = "fimd",
> > -             .devname        = "exynos4-fb.0",
> > -             .enable         = exynos4_clk_ip_lcd0_ctrl,
> > -             .ctrlbit        = (1 << 0),
> > -     }, {
> >               .name           = "hsmmc",
> >               .devname        = "s3c-sdhci.0",
> >               .parent         = &clk_aclk_133.clk,
> > @@ -782,6 +777,13 @@ static struct clk clk_pdma1 = {
> >       .ctrlbit        = (1 << 1),
> >  };
> >
> > +static struct clk clk_fimd0 = {
> > +     .name           = "fimd",
> > +     .devname        = "exynos4-fb.0",
> > +     .enable         = exynos4_clk_ip_lcd0_ctrl,
> > +     .ctrlbit        = (1 << 0),
> > +};
> > +
> >  struct clk *clkset_group_list[] = {
> >       [0] = &clk_ext_xtal_mux,
> >       [1] = &clk_xusbxti,
> > @@ -1294,6 +1296,7 @@ static struct clksrc_clk *sysclks[] = {
> >  static struct clk *clk_cdev[] = {
> >       &clk_pdma0,
> >       &clk_pdma1,
> > +     &clk_fimd0,
> >  };
> >
> >  static struct clksrc_clk *clksrc_cdev[] = {
> > @@ -1318,6 +1321,7 @@ static struct clk_lookup exynos4_clk_lookup[] = {
> >       CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk),
> >       CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0),
> >       CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1),
> > +     CLKDEV_INIT("exynos4-fb.0", "lcd", &clk_fimd0),
> >  };
> >
> >  static int xtal_rate;
>
> Would you please review this patch and let me know your opinion? Without
> this patch, frame-buffer support on EXYNOS4 is broken.
>
> --
> Tushar Behera
>
> _______________________________________________
> linaro-dev mailing list
> linaro-dev@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/linaro-dev
>
Tushar Behera March 12, 2012, 8:53 a.m. UTC | #9
On 03/10/2012 07:52 PM, Chenglie He wrote:
> I am doing the suspend and resume of s3cfb on exynos. the clk_on and
> clk_off just failed. I think this is a related issue.
> 
Without this patch, the probe for s3cfb driver itself fails - hence what
you are seeing must be different.

> On 29 February 2012 13:45, Tushar Behera <tushar.behera@linaro.org> wrote:
> 
>> Hi Kukjin,
>>
>> On 12/01/2011 11:20 AM, Tushar Behera wrote:
>>> The framebuffer driver needs the clock named 'lcd' as its bus
>>> clock but the equivalent clock on Exynos4 is named as 'fimd'.
>>> Hence, create a clkdev lookup entry with the name 'lcd' that
>>> references the 'fimd' clock.
>>>
>>> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
>>> ---
>>>  arch/arm/mach-exynos/clock.c |   14 +++++++++-----
>>>  1 files changed, 9 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
>>> index 5d8d483..607ec28 100644
>>> --- a/arch/arm/mach-exynos/clock.c
>>> +++ b/arch/arm/mach-exynos/clock.c
>>> @@ -489,11 +489,6 @@ static struct clk init_clocks_off[] = {
>>>               .enable         = exynos4_clk_ip_cam_ctrl,
>>>               .ctrlbit        = (1 << 3),
>>>       }, {
>>> -             .name           = "fimd",
>>> -             .devname        = "exynos4-fb.0",
>>> -             .enable         = exynos4_clk_ip_lcd0_ctrl,
>>> -             .ctrlbit        = (1 << 0),
>>> -     }, {
>>>               .name           = "hsmmc",
>>>               .devname        = "s3c-sdhci.0",
>>>               .parent         = &clk_aclk_133.clk,
>>> @@ -782,6 +777,13 @@ static struct clk clk_pdma1 = {
>>>       .ctrlbit        = (1 << 1),
>>>  };
>>>
>>> +static struct clk clk_fimd0 = {
>>> +     .name           = "fimd",
>>> +     .devname        = "exynos4-fb.0",
>>> +     .enable         = exynos4_clk_ip_lcd0_ctrl,
>>> +     .ctrlbit        = (1 << 0),
>>> +};
>>> +
>>>  struct clk *clkset_group_list[] = {
>>>       [0] = &clk_ext_xtal_mux,
>>>       [1] = &clk_xusbxti,
>>> @@ -1294,6 +1296,7 @@ static struct clksrc_clk *sysclks[] = {
>>>  static struct clk *clk_cdev[] = {
>>>       &clk_pdma0,
>>>       &clk_pdma1,
>>> +     &clk_fimd0,
>>>  };
>>>
>>>  static struct clksrc_clk *clksrc_cdev[] = {
>>> @@ -1318,6 +1321,7 @@ static struct clk_lookup exynos4_clk_lookup[] = {
>>>       CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk),
>>>       CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0),
>>>       CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1),
>>> +     CLKDEV_INIT("exynos4-fb.0", "lcd", &clk_fimd0),
>>>  };
>>>
>>>  static int xtal_rate;
>>
>> Would you please review this patch and let me know your opinion? Without
>> this patch, frame-buffer support on EXYNOS4 is broken.
>>
>> --
>> Tushar Behera
>>
>> _______________________________________________
>> linaro-dev mailing list
>> linaro-dev@lists.linaro.org
>> http://lists.linaro.org/mailman/listinfo/linaro-dev
>>
>
diff mbox

Patch

diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 5d8d483..607ec28 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -489,11 +489,6 @@  static struct clk init_clocks_off[] = {
 		.enable		= exynos4_clk_ip_cam_ctrl,
 		.ctrlbit	= (1 << 3),
 	}, {
-		.name		= "fimd",
-		.devname	= "exynos4-fb.0",
-		.enable		= exynos4_clk_ip_lcd0_ctrl,
-		.ctrlbit	= (1 << 0),
-	}, {
 		.name		= "hsmmc",
 		.devname	= "s3c-sdhci.0",
 		.parent		= &clk_aclk_133.clk,
@@ -782,6 +777,13 @@  static struct clk clk_pdma1 = {
 	.ctrlbit	= (1 << 1),
 };
 
+static struct clk clk_fimd0 = {
+	.name		= "fimd",
+	.devname	= "exynos4-fb.0",
+	.enable		= exynos4_clk_ip_lcd0_ctrl,
+	.ctrlbit	= (1 << 0),
+};
+
 struct clk *clkset_group_list[] = {
 	[0] = &clk_ext_xtal_mux,
 	[1] = &clk_xusbxti,
@@ -1294,6 +1296,7 @@  static struct clksrc_clk *sysclks[] = {
 static struct clk *clk_cdev[] = {
 	&clk_pdma0,
 	&clk_pdma1,
+	&clk_fimd0,
 };
 
 static struct clksrc_clk *clksrc_cdev[] = {
@@ -1318,6 +1321,7 @@  static struct clk_lookup exynos4_clk_lookup[] = {
 	CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk),
 	CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0),
 	CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1),
+	CLKDEV_INIT("exynos4-fb.0", "lcd", &clk_fimd0),
 };
 
 static int xtal_rate;