diff options
author | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:45:14 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:45:14 -0700 |
commit | cd07ecc828486e5887113c7dc4d9f9022145811b (patch) | |
tree | f3950d6077a794d4500244b2f372c6912af15eec /arch/arm/plat-omap/clock.c | |
parent | 4c50d22a0cf240918d53afbf9a8416a9d93aacee (diff) | |
parent | b04e8975e70d9b2bc27c017f92b356b312692544 (diff) | |
download | kernel_samsung_tuna-cd07ecc828486e5887113c7dc4d9f9022145811b.zip kernel_samsung_tuna-cd07ecc828486e5887113c7dc4d9f9022145811b.tar.gz kernel_samsung_tuna-cd07ecc828486e5887113c7dc4d9f9022145811b.tar.bz2 |
Merge branch 'omap4' into for-next
Diffstat (limited to 'arch/arm/plat-omap/clock.c')
-rw-r--r-- | arch/arm/plat-omap/clock.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 508c96a..e8c327a 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c @@ -36,10 +36,40 @@ static struct clk_functions *arch_clock; * Standard clock functions defined in include/linux/clk.h *-------------------------------------------------------------------------*/ +/* This functions is moved to arch/arm/common/clkdev.c. For OMAP4 since + * clock framework is not up , it is defined here to avoid rework in + * every driver. Also dummy prcm reset function is added */ + +/* Dummy hooks only for OMAP4.For rest OMAPs, common clkdev is used */ +#if defined(CONFIG_ARCH_OMAP4) +struct clk *clk_get(struct device *dev, const char *id) +{ + return NULL; +} +EXPORT_SYMBOL(clk_get); + +void clk_put(struct clk *clk) +{ +} +EXPORT_SYMBOL(clk_put); + +void omap2_clk_prepare_for_reboot(void) +{ +} +EXPORT_SYMBOL(omap2_clk_prepare_for_reboot); + +void omap_prcm_arch_reset(char mode) +{ +} +EXPORT_SYMBOL(omap_prcm_arch_reset); +#endif int clk_enable(struct clk *clk) { unsigned long flags; int ret = 0; + if (cpu_is_omap44xx()) + /* OMAP4 clk framework not supported yet */ + return 0; if (clk == NULL || IS_ERR(clk)) return -EINVAL; @@ -140,6 +170,9 @@ int clk_set_parent(struct clk *clk, struct clk *parent) unsigned long flags; int ret = -EINVAL; + if (cpu_is_omap44xx()) + /* OMAP4 clk framework not supported yet */ + return 0; if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent)) return ret; |