diff options
author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2013-01-04 02:00:52 -0500 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-01-24 14:09:28 -0500 |
commit | f2f6c2556dcc432e50003bc8fa4d62d95906f149 (patch) | |
tree | b0ffefa1b14c1c9a0435adbd81753cca9b6fed97 /drivers/clk/clk.c | |
parent | 4cfe54e57910b59444d34a05284db27df416f20b (diff) |
clk: add common of_clk_init() function
Modify of_clk_init function so that it will determine which
driver to initialize based on device tree instead of each driver
registering to it.
Based on a similar patch for drivers/irqchip by Thomas Petazzoni and
drivers/clocksource by Stephen Warren.
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Tested-by: Tony Prisk <linux@prisktech.co.nz>
Tested-by: Pawel Moll <pawel.moll@arm.com>
Tested-by: Rob Herring <rob.herring@calxeda.com>
Tested-by: Josh Cartwright <josh.cartwright@ni.com>
Reviewed-by: Josh Cartwright <josh.cartwright@ni.com>
Acked-by: Maxime Ripard <maxime.ripard@anandra.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
[mturquette@linaro.org: merge conflict from missing CLKSRC_OF_TABLES()]
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/clk.c')
-rw-r--r-- | drivers/clk/clk.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index ad2ac94fede8..fabbfe1a9253 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
21 | #include <linux/init.h> | ||
21 | 22 | ||
22 | static DEFINE_SPINLOCK(enable_lock); | 23 | static DEFINE_SPINLOCK(enable_lock); |
23 | static DEFINE_MUTEX(prepare_lock); | 24 | static DEFINE_MUTEX(prepare_lock); |
@@ -1803,6 +1804,11 @@ struct of_clk_provider { | |||
1803 | void *data; | 1804 | void *data; |
1804 | }; | 1805 | }; |
1805 | 1806 | ||
1807 | extern struct of_device_id __clk_of_table[]; | ||
1808 | |||
1809 | static const struct of_device_id __clk_of_table_sentinel | ||
1810 | __used __section(__clk_of_table_end); | ||
1811 | |||
1806 | static LIST_HEAD(of_clk_providers); | 1812 | static LIST_HEAD(of_clk_providers); |
1807 | static DEFINE_MUTEX(of_clk_lock); | 1813 | static DEFINE_MUTEX(of_clk_lock); |
1808 | 1814 | ||
@@ -1931,6 +1937,9 @@ void __init of_clk_init(const struct of_device_id *matches) | |||
1931 | { | 1937 | { |
1932 | struct device_node *np; | 1938 | struct device_node *np; |
1933 | 1939 | ||
1940 | if (!matches) | ||
1941 | matches = __clk_of_table; | ||
1942 | |||
1934 | for_each_matching_node(np, matches) { | 1943 | for_each_matching_node(np, matches) { |
1935 | const struct of_device_id *match = of_match_node(matches, np); | 1944 | const struct of_device_id *match = of_match_node(matches, np); |
1936 | of_clk_init_cb_t clk_init_cb = match->data; | 1945 | of_clk_init_cb_t clk_init_cb = match->data; |