---

yaml --- r: 326642 b: refs/heads/master c: 92fe58f h: refs/heads/master v: v3
git-mirror · Sep 6, 2012 · ef3df92 · ef3df92
1 parent 4433b68
commit ef3df92
Show file tree

Hide file tree

Showing 9 changed files with 3,100 additions and 2,388 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96a1bd1e11ade7be969d275edd4c06749684cdba
+refs/heads/master: 92fe58f07f6e51185497785aed632d0e676afe6e
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -686,6 +686,7 @@ config ARCH_TEGRA
 	select NEED_MACH_IO_H if PCI
 	select ARCH_HAS_CPUFREQ
 	select USE_OF
+	select COMMON_CLK
 	help
 	  This enables support for NVIDIA Tegra based systems (Tegra APX,
 	  Tegra 6xx and Tegra 2 series).

diff --git a/trunk/arch/arm/mach-tegra/clock.h b/trunk/arch/arm/mach-tegra/clock.h
@@ -233,6 +233,7 @@ int clk_set_rate_locked(struct clk *c, unsigned long rate);
 int clk_reparent(struct clk *c, struct clk *parent);
 #endif /* !CONFIG_COMMON_CLK */
 
+void tegra_clk_add(struct clk *c);
 void tegra2_init_clocks(void);
 void tegra30_init_clocks(void);
 struct clk *tegra_get_clock_by_name(const char *name);