Skip to contentSkip to conversation

ARM: S3C64XX: Staticly define parent clock of "camera" clock

PATCH New dron0gus at gmail.com 4 participants 5 messages Nov 10, 2012 – Nov 12, 2012 1 message not in the archive

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 1352556477-3700-1-git-send-email-y

dron0gus at gmail.com

author
#1 lore raw

PATCH 2/2 ARM: S3C64XX: Staticly define parent clock of "camera" clock

From: Andrey Gusakov <[email protected]>

The "camera" clock have only one parent. Define it staticly and remove unused source clock list.

Signed-off-by Andrey Gusakov <[email protected]>
---
 arch/arm/mach-s3c64xx/clock.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)
arch/arm/mach-s3c64xx/clock.c +1 -11
index b2d08fa..19228f3 100644
@@ -677,15 +677,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 clk *clkset_mfc_list[] = {
 	&clk_h2,
 	&clk_mout_epll.clk,

@@ -750,10 +741,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,
 	}, {
 		.clk	= {
 			.name		= "sclk_mfc",
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 2/2 ARM: S3C64XX: Staticly define parent clock of "camera" clock

Hi Andrey,

Quoted 31 lines · On Saturday 10 of November 2012 18:07:57 dron0gus at gmail.com wrote:

From: Andrey Gusakov <[email protected]>

The "camera" clock have only one parent. Define it staticly and remove unused source clock list.

Signed-off-by Andrey Gusakov <[email protected]>
---
 arch/arm/mach-s3c64xx/clock.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-s3c64xx/clock.c index b2d08fa..19228f3 100644

arch/arm/mach-s3c64xx/clock.c +0 -9
@@ -677,15 +677,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 clk *clkset_mfc_list[] = {
 	&clk_h2,
 	&clk_mout_epll.clk,

arch/arm/mach-s3c64xx/clock.c static struct clksrc_clk clksrcs[] = { · line 746

Quoted 6 lines
arch/arm/mach-s3c64xx/clock.c +1 -0
@@ -750,10 +741,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 },

arch/arm/mach-s3c64xx/clock.c static struct clksrc_clk clksrcs[] = { · line 749

Quoted 5 lines
arch/arm/mach-s3c64xx/clock.c +0 -2
-		.reg_src	= { .reg = NULL, .shift = 0, .size = 0  },
-		.sources	= &clkset_camif,
 	}, {
 		.clk	= {
 			.name		= "sclk_mfc",
Reviewed-by Tomasz Figa <[email protected]>

Best regards,
Tomasz Figa

#4 lore raw

PATCH 2/2 ARM: S3C64XX: Staticly define parent clock of "camera" clock

Quoted 4 lines · Sylwester Nawrocki
Quoted 3 lines · On 11/10/2012 03:07 PM, dron0gus at gmail.com wrote:

From: Andrey Gusakov<[email protected]>

The "camera" clock have only one parent. Define it staticly and

Forgot to point out a small typo here: staticly -> statically.

Quoted 5 lines
Quoted 3 lines

remove unused source clock list.

Signed-off-by Andrey Gusakov<[email protected]>
Reviewed-by Sylwester Nawrocki <[email protected]>
#5 lore raw

PATCH 2/2 ARM: S3C64XX: Staticly define parent clock of "camera" clock

Quoted 9 lines · Sylwester Nawrocki
Quoted 4 lines · Sylwester Nawrocki
Quoted 3 lines · On 11/10/2012 03:07 PM, dron0gus at gmail.com wrote:

From: Andrey Gusakov<[email protected]>

The "camera" clock have only one parent. Define it staticly and

Forgot to point out a small typo here: staticly -> statically.

Thanks for pointing out. I fixed it when I applied.

Quoted 5 lines
Quoted 5 lines
Quoted 3 lines

remove unused source clock list.

Signed-off-by Andrey Gusakov<[email protected]>
Reviewed-by Sylwester Nawrocki <[email protected]>

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.