[ARM] pxa: convert to clkdev and match clocks by struct device where possible

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 20 insertions, 39 deletions

diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h
index 73be795fe3bf..4e9c613c6767 100644
--- a/arch/arm/mach-pxa/clock.h
+++ b/arch/arm/mach-pxa/clock.h
@@ -1,6 +1,4 @@
-#include <linux/list.h>
-
-struct clk;
+#include <asm/clkdev.h>
 
 struct clkops {
         void                    (*enable)(struct clk *);
@@ -9,9 +7,6 @@ struct clkops {
 };
 
 struct clk {
-        struct list_head        node;
-        const char              *name;
-        struct device           *dev;
         const struct clkops     *ops;
         unsigned long           rate;
         unsigned int            cken;
@@ -20,41 +15,31 @@ struct clk {
         struct clk              *other;
 };
 
-#define INIT_CKEN(_name, _cken, _rate, _delay, _dev)    \
+#define INIT_CLKREG(_clk,_devname,_conname)             \
         {                                               \
-                .name   = _name,                        \
-                .dev    = _dev,                         \
+                .clk            = _clk,                 \
+                .dev_id         = _devname,             \
+                .con_id         = _conname,             \
+        }
+
+#define DEFINE_CKEN(_name, _cken, _rate, _delay)        \
+struct clk clk_##_name = {                              \
                 .ops    = &clk_cken_ops,                \
                 .rate   = _rate,                        \
                 .cken   = CKEN_##_cken,                 \
                 .delay  = _delay,                       \
         }
 
-#define INIT_CK(_name, _cken, _ops, _dev)               \
-        {                                               \
-                .name   = _name,                        \
-                .dev    = _dev,                         \
+#define DEFINE_CK(_name, _cken, _ops)                   \
+struct clk clk_##_name = {                              \
                 .ops    = _ops,                         \
                 .cken   = CKEN_##_cken,                 \
         }
 
-/*
- * This is a placeholder to alias one clock device+name pair
- * to another struct clk.
- */
-#define INIT_CKOTHER(_name, _other, _dev)               \
-        {                                               \
-                .name   = _name,                        \
-                .dev    = _dev,                         \
-                .other  = _other,                       \
-        }
-
-#define INIT_CLK(_name, _ops, _rate, _delay, _dev)      \
-        {                                               \
-                .name   = _name,                        \
-                .dev    = _dev,                         \
-                .ops    = _ops,                         \
-                .rate   = _rate,                        \
+#define DEFINE_CLK(_name, _ops, _rate, _delay)          \
+struct clk clk_##_name = {                              \
+                .ops    = _ops,                         \
+                .rate   = _rate,                        \
                 .delay  = _delay,                       \
         }
 
@@ -64,20 +49,16 @@ void clk_cken_enable(struct clk *clk);
 void clk_cken_disable(struct clk *clk);
 
 #ifdef CONFIG_PXA3xx
-#define PXA3xx_CKEN(_name, _cken, _rate, _delay, _dev)  \
-        {                                               \
-                .name   = _name,                        \
-                .dev    = _dev,                         \
+#define DEFINE_PXA3_CKEN(_name, _cken, _rate, _delay)   \
+struct clk clk_##_name = {                              \
                 .ops    = &clk_pxa3xx_cken_ops,         \
                 .rate   = _rate,                        \
                 .cken   = CKEN_##_cken,                 \
                 .delay  = _delay,                       \
         }
 
-#define PXA3xx_CK(_name, _cken, _ops, _dev)             \
-        {                                               \
-                .name   = _name,                        \
-                .dev    = _dev,                         \
+#define DEFINE_PXA3_CK(_name, _cken, _ops)              \
+struct clk clk_##_name = {                              \
                 .ops    = _ops,                         \
                 .cken   = CKEN_##_cken,                 \
         }
@@ -87,7 +68,7 @@ extern void clk_pxa3xx_cken_enable(struct clk *);
 extern void clk_pxa3xx_cken_disable(struct clk *);
 #endif
 
-void clks_register(struct clk *clks, size_t num);
+void clks_register(struct clk_lookup *clks, size_t num);
 int clk_add_alias(char *alias, struct device *alias_dev, char *id,
         struct device *dev);