Thread (5 messages) 5 messages, 4 authors, 2012-11-12
STALE5004d

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

From: dron0gus at gmail.com <hidden>
Date: 2012-11-10 14:07:57
Also in: linux-samsung-soc
Subsystem: arm port, the rest · Maintainers: Russell King, Linus Torvalds

From: Andrey Gusakov <redacted>

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

Signed-off-by: Andrey Gusakov <redacted>
---
 arch/arm/mach-s3c64xx/clock.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index b2d08fa..19228f3 100644
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c
@@ -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",
-- 
1.7.0.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help