summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-03-09 14:06:13 -0800
committerKukjin Kim <kgene.kim@samsung.com>2012-03-10 22:28:34 -0800
commitb1d6c5b26d8e242dce12e3a59710e6acad4f9d06 (patch)
tree6b7f66ec22a14c5059dbe17e3bfe7113fec7536e
parentce9c00eea187f0c54971caec477f721c2dc5cd3d (diff)
downloadlinux-3.10-b1d6c5b26d8e242dce12e3a59710e6acad4f9d06.tar.gz
linux-3.10-b1d6c5b26d8e242dce12e3a59710e6acad4f9d06.tar.bz2
linux-3.10-b1d6c5b26d8e242dce12e3a59710e6acad4f9d06.zip
ARM: EXYNOS: use static declaration on regarding clock
This patch uses static declaration struct which is not used in other file and re-arrange with group in header file. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-exynos/clock-exynos4.c18
-rw-r--r--arch/arm/mach-exynos/clock-exynos4.h13
2 files changed, 10 insertions, 21 deletions
diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c
index 962c95e00c0..860b73fcd2a 100644
--- a/arch/arm/mach-exynos/clock-exynos4.c
+++ b/arch/arm/mach-exynos/clock-exynos4.c
@@ -95,21 +95,21 @@ static struct sleep_save exynos4_clock_save[] = {
};
#endif
-struct clk clk_sclk_hdmi27m = {
+static struct clk clk_sclk_hdmi27m = {
.name = "sclk_hdmi27m",
.rate = 27000000,
};
-struct clk clk_sclk_hdmiphy = {
+static struct clk clk_sclk_hdmiphy = {
.name = "sclk_hdmiphy",
};
-struct clk clk_sclk_usbphy0 = {
+static struct clk clk_sclk_usbphy0 = {
.name = "sclk_usbphy0",
.rate = 27000000,
};
-struct clk clk_sclk_usbphy1 = {
+static struct clk clk_sclk_usbphy1 = {
.name = "sclk_usbphy1",
};
@@ -218,7 +218,7 @@ static struct clksrc_clk clk_mout_apll = {
.reg_src = { .reg = S5P_CLKSRC_CPU, .shift = 0, .size = 1 },
};
-struct clksrc_clk clk_sclk_apll = {
+static struct clksrc_clk clk_sclk_apll = {
.clk = {
.name = "sclk_apll",
.parent = &clk_mout_apll.clk,
@@ -226,7 +226,7 @@ struct clksrc_clk clk_sclk_apll = {
.reg_div = { .reg = S5P_CLKDIV_CPU, .shift = 24, .size = 3 },
};
-struct clksrc_clk clk_mout_epll = {
+static struct clksrc_clk clk_mout_epll = {
.clk = {
.name = "mout_epll",
},
@@ -310,7 +310,7 @@ static struct clksrc_clk clk_periphclk = {
/* Core list of CMU_CORE side */
-struct clk *clkset_corebus_list[] = {
+static struct clk *clkset_corebus_list[] = {
[0] = &clk_mout_mpll.clk,
[1] = &clk_sclk_apll.clk,
};
@@ -375,7 +375,7 @@ struct clk *clkset_aclk_top_list[] = {
[1] = &clk_sclk_apll.clk,
};
-struct clksrc_sources clkset_aclk = {
+static struct clksrc_sources clkset_aclk = {
.sources = clkset_aclk_top_list,
.nr_sources = ARRAY_SIZE(clkset_aclk_top_list),
};
@@ -446,7 +446,7 @@ static struct clksrc_sources clkset_sclk_vpll = {
.nr_sources = ARRAY_SIZE(clkset_sclk_vpll_list),
};
-struct clksrc_clk clk_sclk_vpll = {
+static struct clksrc_clk clk_sclk_vpll = {
.clk = {
.name = "sclk_vpll",
},
diff --git a/arch/arm/mach-exynos/clock-exynos4.h b/arch/arm/mach-exynos/clock-exynos4.h
index f64e9f784a3..d2ef305102d 100644
--- a/arch/arm/mach-exynos/clock-exynos4.h
+++ b/arch/arm/mach-exynos/clock-exynos4.h
@@ -15,25 +15,14 @@
#include <linux/clk.h>
-extern struct clk clk_sclk_hdmi27m;
-extern struct clk clk_sclk_usbphy0;
-extern struct clk clk_sclk_usbphy1;
-extern struct clk clk_sclk_hdmiphy;
-
-extern struct clksrc_clk clk_sclk_apll;
extern struct clksrc_clk clk_mout_mpll;
extern struct clksrc_clk clk_aclk_133;
-extern struct clksrc_clk clk_mout_epll;
-extern struct clksrc_clk clk_sclk_vpll;
-extern struct clk *clkset_corebus_list[];
extern struct clksrc_sources clkset_mout_corebus;
+extern struct clksrc_sources clkset_group;
extern struct clk *clkset_aclk_top_list[];
-extern struct clksrc_sources clkset_aclk;
-
extern struct clk *clkset_group_list[];
-extern struct clksrc_sources clkset_group;
extern int exynos4_clksrc_mask_fsys_ctrl(struct clk *clk, int enable);
extern int exynos4_clk_ip_fsys_ctrl(struct clk *clk, int enable);