* [PATCH 1/2] ARM: S3C24XX: Add clkdev entry for camif-upll clock @ 2012-11-07 22:00 ` Sylwester Nawrocki 0 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-07 22:00 UTC (permalink / raw) To: kgene.kim; +Cc: linux-samsung-soc, linux-arm-kernel, 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 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 1/2] ARM: S3C24XX: Add clkdev entry for camif-upll clock @ 2012-11-07 22:00 ` Sylwester Nawrocki 0 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-07 22:00 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 2/2] ARM: S3C64XX: Statically define parent clock of the "camera" clock 2012-11-07 22:00 ` Sylwester Nawrocki @ 2012-11-07 22:00 ` Sylwester Nawrocki -1 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-07 22:00 UTC (permalink / raw) To: kgene.kim; +Cc: linux-samsung-soc, linux-arm-kernel, 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 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 2/2] ARM: S3C64XX: Statically define parent clock of the "camera" clock @ 2012-11-07 22:00 ` Sylwester Nawrocki 0 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-07 22:00 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 2/2] ARM: S3C64XX: Statically define parent clock of the "camera" clock 2012-11-07 22:00 ` Sylwester Nawrocki @ 2012-11-09 7:42 ` Andrey Gusakov -1 siblings, 0 replies; 20+ messages in thread From: Andrey Gusakov @ 2012-11-09 7:42 UTC (permalink / raw) To: Sylwester Nawrocki; +Cc: kgene.kim, linux-samsung-soc, linux-arm-kernel 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@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 2/2] ARM: S3C64XX: Statically define parent clock of the "camera" clock @ 2012-11-09 7:42 ` Andrey Gusakov 0 siblings, 0 replies; 20+ messages in thread From: Andrey Gusakov @ 2012-11-09 7:42 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/2] ARM: S3C64XX: Statically define parent clock of the "camera" clock 2012-11-09 7:42 ` Andrey Gusakov @ 2012-11-09 8:30 ` Sylwester Nawrocki -1 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-09 8:30 UTC (permalink / raw) To: Andrey Gusakov Cc: Sylwester Nawrocki, kgene.kim, linux-samsung-soc, linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 2/2] ARM: S3C64XX: Statically define parent clock of the "camera" clock @ 2012-11-09 8:30 ` Sylwester Nawrocki 0 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-09 8:30 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock 2012-11-09 7:42 ` Andrey Gusakov @ 2012-11-09 8:32 ` Sylwester Nawrocki -1 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-09 8:32 UTC (permalink / raw) To: kgene.kim Cc: dron0gus, linux-samsung-soc, linux-arm-kernel, 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 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock @ 2012-11-09 8:32 ` Sylwester Nawrocki 0 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-09 8:32 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock 2012-11-09 8:32 ` Sylwester Nawrocki @ 2012-11-09 9:31 ` Andrey Gusakov -1 siblings, 0 replies; 20+ messages in thread From: Andrey Gusakov @ 2012-11-09 9:31 UTC (permalink / raw) To: Sylwester Nawrocki; +Cc: kgene.kim, linux-samsung-soc, linux-arm-kernel 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. ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock @ 2012-11-09 9:31 ` Andrey Gusakov 0 siblings, 0 replies; 20+ messages in thread From: Andrey Gusakov @ 2012-11-09 9:31 UTC (permalink / raw) To: linux-arm-kernel 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. ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock 2012-11-09 9:31 ` Andrey Gusakov @ 2012-11-09 10:05 ` Sylwester Nawrocki -1 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-09 10:05 UTC (permalink / raw) To: Andrey Gusakov; +Cc: kgene.kim, linux-samsung-soc, linux-arm-kernel 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. ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock @ 2012-11-09 10:05 ` Sylwester Nawrocki 0 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-09 10:05 UTC (permalink / raw) To: linux-arm-kernel 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. ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock 2012-11-09 10:05 ` Sylwester Nawrocki @ 2012-11-09 10:18 ` Sylwester Nawrocki -1 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-09 10:18 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Andrey Gusakov, kgene.kim, linux-samsung-soc, linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock @ 2012-11-09 10:18 ` Sylwester Nawrocki 0 siblings, 0 replies; 20+ messages in thread From: Sylwester Nawrocki @ 2012-11-09 10:18 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 20+ messages in thread
* RE: [PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock 2012-11-09 9:31 ` Andrey Gusakov @ 2012-11-09 10:08 ` Kukjin Kim -1 siblings, 0 replies; 20+ messages in thread From: Kukjin Kim @ 2012-11-09 10:08 UTC (permalink / raw) To: 'Andrey Gusakov', 'Sylwester Nawrocki' Cc: linux-samsung-soc, linux-arm-kernel 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. ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH] ARM: S3C64XX: Statically define parent clock of the "camera" clock @ 2012-11-09 10:08 ` Kukjin Kim 0 siblings, 0 replies; 20+ messages in thread From: Kukjin Kim @ 2012-11-09 10:08 UTC (permalink / raw) To: linux-arm-kernel 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. ^ permalink raw reply related [flat|nested] 20+ messages in thread
* RE: [PATCH 1/2] ARM: S3C24XX: Add clkdev entry for camif-upll clock 2012-11-07 22:00 ` Sylwester Nawrocki @ 2012-11-22 6:51 ` Kukjin Kim -1 siblings, 0 replies; 20+ messages in thread From: Kukjin Kim @ 2012-11-22 6:51 UTC (permalink / raw) To: 'Sylwester Nawrocki'; +Cc: linux-samsung-soc, linux-arm-kernel 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> ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/2] ARM: S3C24XX: Add clkdev entry for camif-upll clock @ 2012-11-22 6:51 ` Kukjin Kim 0 siblings, 0 replies; 20+ messages in thread From: Kukjin Kim @ 2012-11-22 6:51 UTC (permalink / raw) To: linux-arm-kernel 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> ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2012-11-22 6:51 UTC | newest] Thread overview: 20+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-11-07 22:00 [PATCH 1/2] ARM: S3C24XX: Add clkdev entry for camif-upll clock Sylwester Nawrocki 2012-11-07 22:00 ` Sylwester Nawrocki 2012-11-07 22:00 ` [PATCH 2/2] ARM: S3C64XX: Statically define parent clock of the "camera" clock Sylwester Nawrocki 2012-11-07 22:00 ` Sylwester Nawrocki 2012-11-09 7:42 ` Andrey Gusakov 2012-11-09 7:42 ` Andrey Gusakov 2012-11-09 8:30 ` Sylwester Nawrocki 2012-11-09 8:30 ` Sylwester Nawrocki 2012-11-09 8:32 ` [PATCH] " Sylwester Nawrocki 2012-11-09 8:32 ` Sylwester Nawrocki 2012-11-09 9:31 ` Andrey Gusakov 2012-11-09 9:31 ` Andrey Gusakov 2012-11-09 10:05 ` Sylwester Nawrocki 2012-11-09 10:05 ` Sylwester Nawrocki 2012-11-09 10:18 ` Sylwester Nawrocki 2012-11-09 10:18 ` Sylwester Nawrocki 2012-11-09 10:08 ` Kukjin Kim 2012-11-09 10:08 ` Kukjin Kim 2012-11-22 6:51 ` [PATCH 1/2] ARM: S3C24XX: Add clkdev entry for camif-upll clock Kukjin Kim 2012-11-22 6:51 ` Kukjin Kim
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.