[PATCH 1/2] ARM: S3C24XX: Add clkdev entry for camif-upll clock

[PATCH 1/2] ARM: S3C24XX: Add clkdev entry for camif-upll clock

[Sylwester Nawrocki]

The s3c-camif driver uses "camera" clock conn_id for the "camif-upll"
(s3c244x) and "camera" (s3c64xx) platform clock. By adding this new
clkdev entry the platform differences are isolated from the driver.

Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
---
 arch/arm/mach-s3c24xx/clock-s3c2440.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/clock-s3c2440.c b/arch/arm/mach-s3c24xx/clock-s3c2440.c
index 4407b17..04b87ec 100644
--- a/arch/arm/mach-s3c24xx/clock-s3c2440.c
+++ b/arch/arm/mach-s3c24xx/clock-s3c2440.c
@@ -161,6 +161,7 @@ static struct clk_lookup s3c2440_clk_lookup[] = {
 	CLKDEV_INIT(NULL, "clk_uart_baud1", &s3c24xx_uclk),
 	CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p),
 	CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n),
+	CLKDEV_INIT("s3c2440-camif", "camera", &s3c2440_clk_cam_upll),
 };
 
 static int __init_refok s3c2440_clk_add(struct device *dev, struct subsys_interface *sif)
-- 
1.7.4.1

[PATCH 2/2] ARM: S3C64XX: Statically define parent clock of the "camera" clock

[Sylwester Nawrocki]

The "camera" clock defined in arch/arm/mach-s3c64xx/clock.c has null
clock source mux control register as it can have only one parent
clock. In such cases there is a need to configure the parent clock
statically, otherwise s3c_set_clksrc() bails out with an error message
"no parent clock specified" leaving the parent clock not configured.
Define statically the parent clock so it is possible to get or set rate
of the "camera" clock.

Reported-by: In-Bae Jeong <kukyakya@gmail.com>
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
---
 arch/arm/mach-s3c64xx/clock.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index 28041e8..85b9cf1 100644
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c
@@ -744,6 +744,7 @@ static struct clksrc_clk clksrcs[] = {
 			.name		= "camera",
 			.ctrlbit        = S3C_CLKCON_SCLK_CAM,
 			.enable		= s3c64xx_sclk_ctrl,
+			.parent		= &clk_h2,
 		},
 		.reg_div	= { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4  },
 		.reg_src	= { .reg = NULL, .shift = 0, .size = 0  },
-- 
1.7.4.1

[PATCH 2/2] ARM: S3C64XX: Statically define parent clock of the "camera" clock

[Andrey Gusakov]

Hi.

I think .reg_src can be removed? This clock have only one source.

On Thu, Nov 8, 2012 at 2:00 AM, Sylwester Nawrocki
<sylvester.nawrocki@gmail.com> wrote:
> The "camera" clock defined in arch/arm/mach-s3c64xx/clock.c has null
> clock source mux control register as it can have only one parent
> clock. In such cases there is a need to configure the parent clock
> statically, otherwise s3c_set_clksrc() bails out with an error message
> "no parent clock specified" leaving the parent clock not configured.
> Define statically the parent clock so it is possible to get or set rate
> of the "camera" clock.
>
> Reported-by: In-Bae Jeong <kukyakya@gmail.com>
> Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
> ---
>  arch/arm/mach-s3c64xx/clock.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
> index 28041e8..85b9cf1 100644
> --- a/arch/arm/mach-s3c64xx/clock.c
> +++ b/arch/arm/mach-s3c64xx/clock.c
> @@ -744,6 +744,7 @@ static struct clksrc_clk clksrcs[] = {
>                         .name           = "camera",
>                         .ctrlbit        = S3C_CLKCON_SCLK_CAM,
>                         .enable         = s3c64xx_sclk_ctrl,
> +                       .parent         = &clk_h2,
>                 },
>                 .reg_div        = { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4  },
>                 .reg_src        = { .reg = NULL, .shift = 0, .size = 0  },
> --
> 1.7.4.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] ARM: S3C64XX: Statically define parent clock of the "camera" clock

[Sylwester Nawrocki]

On 11/09/2012 08:42 AM, Andrey Gusakov wrote:
> Hi.
>
> I think .reg_src can be removed? This clock have only one source.

Yes, good point. I'll repost with reg_src removed.
Can you test that patch then ?

Thanks,
Sylwester

> On Thu, Nov 8, 2012 at 2:00 AM, Sylwester Nawrocki
> <sylvester.nawrocki@gmail.com>  wrote:
>> The "camera" clock defined in arch/arm/mach-s3c64xx/clock.c has null
>> clock source mux control register as it can have only one parent
>> clock. In such cases there is a need to configure the parent clock
>> statically, otherwise s3c_set_clksrc() bails out with an error message
>> "no parent clock specified" leaving the parent clock not configured.
>> Define statically the parent clock so it is possible to get or set rate
>> of the "camera" clock.
>>
>> Reported-by: In-Bae Jeong<kukyakya@gmail.com>
>> Signed-off-by: Sylwester Nawrocki<sylvester.nawrocki@gmail.com>
>> ---
>>   arch/arm/mach-s3c64xx/clock.c |    1 +
>>   1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
>> index 28041e8..85b9cf1 100644
>> --- a/arch/arm/mach-s3c64xx/clock.c
>> +++ b/arch/arm/mach-s3c64xx/clock.c
>> @@ -744,6 +744,7 @@ static struct clksrc_clk clksrcs[] = {
>>                          .name           = "camera",
>>                          .ctrlbit        = S3C_CLKCON_SCLK_CAM,
>>                          .enable         = s3c64xx_sclk_ctrl,
>> +                       .parent         =&clk_h2,
>>                  },
>>                  .reg_div        = { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4  },
>>                  .reg_src        = { .reg = NULL, .shift = 0, .size = 0  },
>> --
>> 1.7.4.1

[PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock

[Sylwester Nawrocki]

The "camera" clock defined in arch/arm/mach-s3c64xx/clock.c has null
clock source mux control register as it can have only one parent
clock. In such cases there is a need to configure the parent clock
statically, otherwise s3c_set_clksrc() bails out with an error message
"no parent clock specified" leaving the parent clock not configured.
Define statically the parent clock so it is possible to get or set
rate of the "camera" clock.
While at it remove the unneded null reg_src definition.

Reported-by: In-Bae Jeong <kukyakya@gmail.com>
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
---
 arch/arm/mach-s3c64xx/clock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index 28041e8..2e6d7f9 100644
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c
@@ -744,9 +744,9 @@ static struct clksrc_clk clksrcs[] = {
 			.name		= "camera",
 			.ctrlbit        = S3C_CLKCON_SCLK_CAM,
 			.enable		= s3c64xx_sclk_ctrl,
+			.parent		= &clk_h2,
 		},
 		.reg_div	= { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4  },
-		.reg_src	= { .reg = NULL, .shift = 0, .size = 0  },
 		.sources	= &clkset_camif,
 	},
 };
-- 
1.7.4.1

[PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock

[Andrey Gusakov]

Hi.

On Fri, Nov 9, 2012 at 12:32 PM, Sylwester Nawrocki
<sylvester.nawrocki@gmail.com> wrote:
> The "camera" clock defined in arch/arm/mach-s3c64xx/clock.c has null
> clock source mux control register as it can have only one parent
> clock. In such cases there is a need to configure the parent clock
> statically, otherwise s3c_set_clksrc() bails out with an error message
> "no parent clock specified" leaving the parent clock not configured.
> Define statically the parent clock so it is possible to get or set
> rate of the "camera" clock.
> While at it remove the unneded null reg_src definition.
>
> Reported-by: In-Bae Jeong <kukyakya@gmail.com>
> Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
> ---
>  arch/arm/mach-s3c64xx/clock.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
> index 28041e8..2e6d7f9 100644
> --- a/arch/arm/mach-s3c64xx/clock.c
> +++ b/arch/arm/mach-s3c64xx/clock.c
> @@ -744,9 +744,9 @@ static struct clksrc_clk clksrcs[] = {
>                         .name           = "camera",
>                         .ctrlbit        = S3C_CLKCON_SCLK_CAM,
>                         .enable         = s3c64xx_sclk_ctrl,
> +                       .parent         = &clk_h2,
>                 },
>                 .reg_div        = { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4  },
> -               .reg_src        = { .reg = NULL, .shift = 0, .size = 0  },
>                 .sources        = &clkset_camif,
Just figure out that .sources can be removed to. And seems
"clkset_camif" and "clkset_camif_list" can be removed as unused.

I'll try to test it tiday.

[PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock

[Sylwester Nawrocki]

Hi,

On 11/09/2012 10:31 AM, Andrey Gusakov wrote:
> On Fri, Nov 9, 2012 at 12:32 PM, Sylwester Nawrocki
> <sylvester.nawrocki@gmail.com>  wrote:
>> The "camera" clock defined in arch/arm/mach-s3c64xx/clock.c has null
>> clock source mux control register as it can have only one parent
>> clock. In such cases there is a need to configure the parent clock
>> statically, otherwise s3c_set_clksrc() bails out with an error message
>> "no parent clock specified" leaving the parent clock not configured.
>> Define statically the parent clock so it is possible to get or set
>> rate of the "camera" clock.
>> While at it remove the unneded null reg_src definition.
>>
>> Reported-by: In-Bae Jeong<kukyakya@gmail.com>
>> Signed-off-by: Sylwester Nawrocki<sylvester.nawrocki@gmail.com>
>> ---
>>   arch/arm/mach-s3c64xx/clock.c |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
>> index 28041e8..2e6d7f9 100644
>> --- a/arch/arm/mach-s3c64xx/clock.c
>> +++ b/arch/arm/mach-s3c64xx/clock.c
>> @@ -744,9 +744,9 @@ static struct clksrc_clk clksrcs[] = {
>>                          .name           = "camera",
>>                          .ctrlbit        = S3C_CLKCON_SCLK_CAM,
>>                          .enable         = s3c64xx_sclk_ctrl,
>> +                       .parent         =&clk_h2,
>>                  },
>>                  .reg_div        = { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4  },
>> -               .reg_src        = { .reg = NULL, .shift = 0, .size = 0  },
>>                  .sources        =&clkset_camif,
> Just figure out that .sources can be removed to. And seems
> "clkset_camif" and "clkset_camif_list" can be removed as unused.

OK, you're right. I think it could be done as a separate patch,
depending on this one to avoid conflicts.

> I'll try to test it tiday.

Thanks.

[PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock

[Kukjin Kim]

Andrey Gusakov wrote:
> 
> Hi.
> 
> On Fri, Nov 9, 2012 at 12:32 PM, Sylwester Nawrocki
> <sylvester.nawrocki@gmail.com> wrote:
> > The "camera" clock defined in arch/arm/mach-s3c64xx/clock.c has null
> > clock source mux control register as it can have only one parent
> > clock. In such cases there is a need to configure the parent clock
> > statically, otherwise s3c_set_clksrc() bails out with an error message
> > "no parent clock specified" leaving the parent clock not configured.
> > Define statically the parent clock so it is possible to get or set
> > rate of the "camera" clock.
> > While at it remove the unneded null reg_src definition.
> >
> > Reported-by: In-Bae Jeong <kukyakya@gmail.com>
> > Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
> > ---
> >  arch/arm/mach-s3c64xx/clock.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-
> s3c64xx/clock.c
> > index 28041e8..2e6d7f9 100644
> > --- a/arch/arm/mach-s3c64xx/clock.c
> > +++ b/arch/arm/mach-s3c64xx/clock.c
> > @@ -744,9 +744,9 @@ static struct clksrc_clk clksrcs[] = {
> >                         .name           = "camera",
> >                         .ctrlbit        = S3C_CLKCON_SCLK_CAM,
> >                         .enable         = s3c64xx_sclk_ctrl,
> > +                       .parent         = &clk_h2,
> >                 },
> >                 .reg_div        = { .reg = S3C_CLK_DIV0, .shift = 20,
.size =
> 4  },
> > -               .reg_src        = { .reg = NULL, .shift = 0, .size = 0
},
> >                 .sources        = &clkset_camif,
> Just figure out that .sources can be removed to. And seems
> "clkset_camif" and "clkset_camif_list" can be removed as unused.
> 
Yeah, in this case, right. And we don't need source field as well because
its source is fixed.

See below.

8<----
diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index 28041e8..e963711 100644
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c
@@ -681,15 +681,6 @@ static struct clksrc_sources clkset_audio2 = {
 	.nr_sources	= ARRAY_SIZE(clkset_audio2_list),
 };
 
-static struct clk *clkset_camif_list[] = {
-	&clk_h2,
-};
-
-static struct clksrc_sources clkset_camif = {
-	.sources	= clkset_camif_list,
-	.nr_sources	= ARRAY_SIZE(clkset_camif_list),
-};
-
 static struct clksrc_clk clksrcs[] = {
 	{
 		.clk	= {
@@ -742,12 +733,11 @@ static struct clksrc_clk clksrcs[] = {
 	}, {
 		.clk	= {
 			.name		= "camera",
+			.parent		= &clk_h2,
 			.ctrlbit        = S3C_CLKCON_SCLK_CAM,
 			.enable		= s3c64xx_sclk_ctrl,
 		},
 		.reg_div	= { .reg = S3C_CLK_DIV0, .shift = 20, .size
= 4  },
-		.reg_src	= { .reg = NULL, .shift = 0, .size = 0  },
-		.sources	= &clkset_camif,
 	},
 };
8<----

Thanks.

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

[PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock

[Sylwester Nawrocki]

On 11/09/2012 11:05 AM, Sylwester Nawrocki wrote:
> Hi,
>
> On 11/09/2012 10:31 AM, Andrey Gusakov wrote:
>> On Fri, Nov 9, 2012 at 12:32 PM, Sylwester Nawrocki
>> <sylvester.nawrocki@gmail.com> wrote:
>>> The "camera" clock defined in arch/arm/mach-s3c64xx/clock.c has null
>>> clock source mux control register as it can have only one parent
>>> clock. In such cases there is a need to configure the parent clock
>>> statically, otherwise s3c_set_clksrc() bails out with an error message
>>> "no parent clock specified" leaving the parent clock not configured.
>>> Define statically the parent clock so it is possible to get or set
>>> rate of the "camera" clock.
>>> While at it remove the unneded null reg_src definition.
>>>
>>> Reported-by: In-Bae Jeong<kukyakya@gmail.com>
>>> Signed-off-by: Sylwester Nawrocki<sylvester.nawrocki@gmail.com>
>>> ---
>>> arch/arm/mach-s3c64xx/clock.c | 2 +-
>>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-s3c64xx/clock.c
>>> b/arch/arm/mach-s3c64xx/clock.c
>>> index 28041e8..2e6d7f9 100644
>>> --- a/arch/arm/mach-s3c64xx/clock.c
>>> +++ b/arch/arm/mach-s3c64xx/clock.c
>>> @@ -744,9 +744,9 @@ static struct clksrc_clk clksrcs[] = {
>>> .name = "camera",
>>> .ctrlbit = S3C_CLKCON_SCLK_CAM,
>>> .enable = s3c64xx_sclk_ctrl,
>>> + .parent =&clk_h2,
>>> },
>>> .reg_div = { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4 },
>>> - .reg_src = { .reg = NULL, .shift = 0, .size = 0 },
>>> .sources =&clkset_camif,
>> Just figure out that .sources can be removed to. And seems
>> "clkset_camif" and "clkset_camif_list" can be removed as unused.
>
> OK, you're right. I think it could be done as a separate patch,
> depending on this one to avoid conflicts.

Or feel free to make a new patch, ignoring this one.

--
Regards,
Sylwester

[PATCH 1/2] ARM: S3C24XX: Add clkdev entry for camif-upll clock

[Kukjin Kim]

Sylwester Nawrocki wrote:
> 
> The s3c-camif driver uses "camera" clock conn_id for the "camif-upll"
> (s3c244x) and "camera" (s3c64xx) platform clock. By adding this new
> clkdev entry the platform differences are isolated from the driver.
> 
> Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
> ---
>  arch/arm/mach-s3c24xx/clock-s3c2440.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-s3c24xx/clock-s3c2440.c b/arch/arm/mach-
> s3c24xx/clock-s3c2440.c
> index 4407b17..04b87ec 100644
> --- a/arch/arm/mach-s3c24xx/clock-s3c2440.c
> +++ b/arch/arm/mach-s3c24xx/clock-s3c2440.c
> @@ -161,6 +161,7 @@ static struct clk_lookup s3c2440_clk_lookup[] = {
>  	CLKDEV_INIT(NULL, "clk_uart_baud1", &s3c24xx_uclk),
>  	CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p),
>  	CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n),
> +	CLKDEV_INIT("s3c2440-camif", "camera", &s3c2440_clk_cam_upll),
>  };
> 
>  static int __init_refok s3c2440_clk_add(struct device *dev, struct
> subsys_interface *sif)
> --
> 1.7.4.1

Applied, thanks.

K-Gene <kgene@kernel.org>