aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-06 17:32:52 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-06 17:32:52 -0500
commit4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch)
treef41c17eac157b1223ce104845cf9b1e5a9e6a83d /drivers
parent58daf18cdcab550262a5f4681e1f1e073e21965a (diff)
parent4ec3eb13634529c0bc7466658d84d0bbe3244aea (diff)
Merge branch 'misc' into devel
Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c
Diffstat (limited to 'drivers')
-rw-r--r--drivers/Kconfig2
-rw-r--r--drivers/Makefile2
-rw-r--r--drivers/amba/bus.c39
-rw-r--r--drivers/clk/Kconfig4
-rw-r--r--drivers/clk/Makefile2
-rw-r--r--drivers/clk/clkdev.c176
6 files changed, 225 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig
index a2b902f4d437..3d93b3a3d630 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -111,4 +111,6 @@ source "drivers/xen/Kconfig"
111source "drivers/staging/Kconfig" 111source "drivers/staging/Kconfig"
112 112
113source "drivers/platform/Kconfig" 113source "drivers/platform/Kconfig"
114
115source "drivers/clk/Kconfig"
114endmenu 116endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index f3ebb30f1b7f..bf15ce7493d2 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -115,3 +115,5 @@ obj-$(CONFIG_VLYNQ) += vlynq/
115obj-$(CONFIG_STAGING) += staging/ 115obj-$(CONFIG_STAGING) += staging/
116obj-y += platform/ 116obj-y += platform/
117obj-y += ieee802154/ 117obj-y += ieee802154/
118#common clk code
119obj-y += clk/
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 2737b9752205..e7df019d29d4 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -147,6 +147,39 @@ static void amba_put_disable_pclk(struct amba_device *pcdev)
147 clk_put(pclk); 147 clk_put(pclk);
148} 148}
149 149
150static int amba_get_enable_vcore(struct amba_device *pcdev)
151{
152 struct regulator *vcore = regulator_get(&pcdev->dev, "vcore");
153 int ret;
154
155 pcdev->vcore = vcore;
156
157 if (IS_ERR(vcore)) {
158 /* It is OK not to supply a vcore regulator */
159 if (PTR_ERR(vcore) == -ENODEV)
160 return 0;
161 return PTR_ERR(vcore);
162 }
163
164 ret = regulator_enable(vcore);
165 if (ret) {
166 regulator_put(vcore);
167 pcdev->vcore = ERR_PTR(-ENODEV);
168 }
169
170 return ret;
171}
172
173static void amba_put_disable_vcore(struct amba_device *pcdev)
174{
175 struct regulator *vcore = pcdev->vcore;
176
177 if (!IS_ERR(vcore)) {
178 regulator_disable(vcore);
179 regulator_put(vcore);
180 }
181}
182
150/* 183/*
151 * These are the device model conversion veneers; they convert the 184 * These are the device model conversion veneers; they convert the
152 * device model structures to our more specific structures. 185 * device model structures to our more specific structures.
@@ -159,6 +192,10 @@ static int amba_probe(struct device *dev)
159 int ret; 192 int ret;
160 193
161 do { 194 do {
195 ret = amba_get_enable_vcore(pcdev);
196 if (ret)
197 break;
198
162 ret = amba_get_enable_pclk(pcdev); 199 ret = amba_get_enable_pclk(pcdev);
163 if (ret) 200 if (ret)
164 break; 201 break;
@@ -168,6 +205,7 @@ static int amba_probe(struct device *dev)
168 break; 205 break;
169 206
170 amba_put_disable_pclk(pcdev); 207 amba_put_disable_pclk(pcdev);
208 amba_put_disable_vcore(pcdev);
171 } while (0); 209 } while (0);
172 210
173 return ret; 211 return ret;
@@ -180,6 +218,7 @@ static int amba_remove(struct device *dev)
180 int ret = drv->remove(pcdev); 218 int ret = drv->remove(pcdev);
181 219
182 amba_put_disable_pclk(pcdev); 220 amba_put_disable_pclk(pcdev);
221 amba_put_disable_vcore(pcdev);
183 222
184 return ret; 223 return ret;
185} 224}
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
new file mode 100644
index 000000000000..4168c8896e16
--- /dev/null
+++ b/drivers/clk/Kconfig
@@ -0,0 +1,4 @@
1
2config CLKDEV_LOOKUP
3 bool
4 select HAVE_CLK
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
new file mode 100644
index 000000000000..07613fa172c9
--- /dev/null
+++ b/drivers/clk/Makefile
@@ -0,0 +1,2 @@
1
2obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
new file mode 100644
index 000000000000..0fc0a79852de
--- /dev/null
+++ b/drivers/clk/clkdev.c
@@ -0,0 +1,176 @@
1/*
2 * drivers/clk/clkdev.c
3 *
4 * Copyright (C) 2008 Russell King.
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 *
10 * Helper for the clk API to assist looking up a struct clk.
11 */
12#include <linux/module.h>
13#include <linux/kernel.h>
14#include <linux/device.h>
15#include <linux/list.h>
16#include <linux/errno.h>
17#include <linux/err.h>
18#include <linux/string.h>
19#include <linux/mutex.h>
20#include <linux/clk.h>
21#include <linux/clkdev.h>
22
23static LIST_HEAD(clocks);
24static DEFINE_MUTEX(clocks_mutex);
25
26/*
27 * Find the correct struct clk for the device and connection ID.
28 * We do slightly fuzzy matching here:
29 * An entry with a NULL ID is assumed to be a wildcard.
30 * If an entry has a device ID, it must match
31 * If an entry has a connection ID, it must match
32 * Then we take the most specific entry - with the following
33 * order of precedence: dev+con > dev only > con only.
34 */
35static struct clk *clk_find(const char *dev_id, const char *con_id)
36{
37 struct clk_lookup *p;
38 struct clk *clk = NULL;
39 int match, best = 0;
40
41 list_for_each_entry(p, &clocks, node) {
42 match = 0;
43 if (p->dev_id) {
44 if (!dev_id || strcmp(p->dev_id, dev_id))
45 continue;
46 match += 2;
47 }
48 if (p->con_id) {
49 if (!con_id || strcmp(p->con_id, con_id))
50 continue;
51 match += 1;
52 }
53
54 if (match > best) {
55 clk = p->clk;
56 if (match != 3)
57 best = match;
58 else
59 break;
60 }
61 }
62 return clk;
63}
64
65struct clk *clk_get_sys(const char *dev_id, const char *con_id)
66{
67 struct clk *clk;
68
69 mutex_lock(&clocks_mutex);
70 clk = clk_find(dev_id, con_id);
71 if (clk && !__clk_get(clk))
72 clk = NULL;
73 mutex_unlock(&clocks_mutex);
74
75 return clk ? clk : ERR_PTR(-ENOENT);
76}
77EXPORT_SYMBOL(clk_get_sys);
78
79struct clk *clk_get(struct device *dev, const char *con_id)
80{
81 const char *dev_id = dev ? dev_name(dev) : NULL;
82
83 return clk_get_sys(dev_id, con_id);
84}
85EXPORT_SYMBOL(clk_get);
86
87void clk_put(struct clk *clk)
88{
89 __clk_put(clk);
90}
91EXPORT_SYMBOL(clk_put);
92
93void clkdev_add(struct clk_lookup *cl)
94{
95 mutex_lock(&clocks_mutex);
96 list_add_tail(&cl->node, &clocks);
97 mutex_unlock(&clocks_mutex);
98}
99EXPORT_SYMBOL(clkdev_add);
100
101void __init clkdev_add_table(struct clk_lookup *cl, size_t num)
102{
103 mutex_lock(&clocks_mutex);
104 while (num--) {
105 list_add_tail(&cl->node, &clocks);
106 cl++;
107 }
108 mutex_unlock(&clocks_mutex);
109}
110
111#define MAX_DEV_ID 20
112#define MAX_CON_ID 16
113
114struct clk_lookup_alloc {
115 struct clk_lookup cl;
116 char dev_id[MAX_DEV_ID];
117 char con_id[MAX_CON_ID];
118};
119
120struct clk_lookup * __init_refok
121clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...)
122{
123 struct clk_lookup_alloc *cla;
124
125 cla = __clkdev_alloc(sizeof(*cla));
126 if (!cla)
127 return NULL;
128
129 cla->cl.clk = clk;
130 if (con_id) {
131 strlcpy(cla->con_id, con_id, sizeof(cla->con_id));
132 cla->cl.con_id = cla->con_id;
133 }
134
135 if (dev_fmt) {
136 va_list ap;
137
138 va_start(ap, dev_fmt);
139 vscnprintf(cla->dev_id, sizeof(cla->dev_id), dev_fmt, ap);
140 cla->cl.dev_id = cla->dev_id;
141 va_end(ap);
142 }
143
144 return &cla->cl;
145}
146EXPORT_SYMBOL(clkdev_alloc);
147
148int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
149 struct device *dev)
150{
151 struct clk *r = clk_get(dev, id);
152 struct clk_lookup *l;
153
154 if (IS_ERR(r))
155 return PTR_ERR(r);
156
157 l = clkdev_alloc(r, alias, alias_dev_name);
158 clk_put(r);
159 if (!l)
160 return -ENODEV;
161 clkdev_add(l);
162 return 0;
163}
164EXPORT_SYMBOL(clk_add_alias);
165
166/*
167 * clkdev_drop - remove a clock dynamically allocated
168 */
169void clkdev_drop(struct clk_lookup *cl)
170{
171 mutex_lock(&clocks_mutex);
172 list_del(&cl->node);
173 mutex_unlock(&clocks_mutex);
174 kfree(cl);
175}
176EXPORT_SYMBOL(clkdev_drop);