aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-19 18:04:06 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-19 18:04:06 +0900
commit71b4439657a135a9ca7d11bc4ae3105628ed1186 (patch)
tree1f0838ed6988bcc1d32a9a0439576b44e229ffaf
parentf447ea4b1c90fe94f0627d7a6655a402100f8ca5 (diff)
parentf001d5b28bc583c85281a9ce315ac16970201eae (diff)
downloadmrst-s0i3-test-71b4439657a135a9ca7d11bc4ae3105628ed1186.tar.gz
mrst-s0i3-test-71b4439657a135a9ca7d11bc4ae3105628ed1186.tar.xz
mrst-s0i3-test-71b4439657a135a9ca7d11bc4ae3105628ed1186.zip
ARM: Merge for-2635/samsung-clock
Merge branch 'for-2635/samsung-clock' into for-linus/samsung2
-rw-r--r--arch/arm/plat-s5p/clock.c5
-rw-r--r--arch/arm/plat-s5p/include/plat/s5p-clock.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/clock.c b/arch/arm/plat-s5p/clock.c
index aa96e335073..3fef951445d 100644
--- a/arch/arm/plat-s5p/clock.c
+++ b/arch/arm/plat-s5p/clock.c
@@ -33,6 +33,11 @@ struct clk clk_ext_xtal_mux = {
.id = -1,
};
+struct clk clk_xusbxti = {
+ .name = "xusbxti",
+ .id = -1,
+};
+
static struct clk s5p_clk_27m = {
.name = "clk_27m",
.id = -1,
diff --git a/arch/arm/plat-s5p/include/plat/s5p-clock.h b/arch/arm/plat-s5p/include/plat/s5p-clock.h
index 56fb8b414d4..a476a9f1469 100644
--- a/arch/arm/plat-s5p/include/plat/s5p-clock.h
+++ b/arch/arm/plat-s5p/include/plat/s5p-clock.h
@@ -23,6 +23,7 @@
#define clk_fin_vpll clk_ext_xtal_mux
extern struct clk clk_ext_xtal_mux;
+extern struct clk clk_xusbxti;
extern struct clk clk_48m;
extern struct clk clk_fout_apll;
extern struct clk clk_fout_mpll;