summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/include
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-07-21 10:28:23 +0200
committerKukjin Kim <kgene.kim@samsung.com>2011-07-21 10:28:23 +0200
commit2c0b6871008ffa455145affb08bb63f7b47040c3 (patch)
treefd8a858a74b1ea4927d1faed2773d30ee6d40b48 /arch/arm/plat-samsung/include
parentARM: SAMSUNG: Add IRQ_I2S0 definition (diff)
parentARM: SAMSUNG: Added mach/clkdev.h (diff)
downloadlinux-2c0b6871008ffa455145affb08bb63f7b47040c3.tar.xz
linux-2c0b6871008ffa455145affb08bb63f7b47040c3.zip
Merge branch 'next-samsung-clkdev-fix' into next-samsung-devel
Diffstat (limited to 'arch/arm/plat-samsung/include')
-rw-r--r--arch/arm/plat-samsung/include/plat/clock.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
index 983c578b8276..87d5b38a86fb 100644
--- a/arch/arm/plat-samsung/include/plat/clock.h
+++ b/arch/arm/plat-samsung/include/plat/clock.h
@@ -10,6 +10,7 @@
*/
#include <linux/spinlock.h>
+#include <linux/clkdev.h>
struct clk;
@@ -40,6 +41,7 @@ struct clk {
struct module *owner;
struct clk *parent;
const char *name;
+ const char *devname;
int id;
int usage;
unsigned long rate;
@@ -47,6 +49,7 @@ struct clk {
struct clk_ops *ops;
int (*enable)(struct clk *, int enable);
+ struct clk_lookup lookup;
#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
struct dentry *dent; /* For visible tree hierarchy */
#endif