[PATCH v4 RESEND 1/6] clk: Add temporary mapping to the existing API
DORMANTno replies
From: Tomeu Vizoso <hidden>
Date: 2014-07-31 11:41:40
Also in:
lkml
Subsystem:
arm port, arm/clkdev support, arm/marvell dove/mv78xx0/orion soc support, common clk framework, media input infrastructure (v4l/dvb), omap2+ support, the rest · Maintainers:
Russell King, Andrew Lunn, Sebastian Hesselbarth, Gregory Clement, Stephen Boyd, Brian Masney, Jerome Brunet, Mauro Carvalho Chehab, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
Revision v4 of 25 in this series.
Revisions (25)
- v4 [diff vs current]
- v4 current
- v5 [diff vs current]
- v6 [diff vs current]
- v7 [diff vs current]
- v7 [diff vs current]
- v8 [diff vs current]
- v9 [diff vs current]
- v10 [diff vs current]
- v11 [diff vs current]
- v12 [diff vs current]
- v13 [diff vs current]
- v1 [diff vs current]
- v2 [diff vs current]
- v3 [diff vs current]
- v4 [diff vs current]
- v5 [diff vs current]
- v6 [diff vs current]
- v7 [diff vs current]
- v8 [diff vs current]
- v9 [diff vs current]
- v10 [diff vs current]
- v11 [diff vs current]
- v12 [diff vs current]
- v13 [diff vs current]
To preserve git-bisectability, add aliases from the future provider API to the existing public API. Also includes clk-provider.h and clk-dev.h in a few places so the right functions are defined. Signed-off-by: Tomeu Vizoso <redacted> --- v4: * Add more clk-provider.h includes to clk implementations * Add mapping for clk_provider_round_rate --- arch/arm/mach-omap2/display.c | 1 + arch/arm/mach-omap2/omap_device.c | 1 + arch/arm/plat-orion/common.c | 1 + drivers/clk/berlin/bg2.c | 1 + drivers/clk/berlin/bg2q.c | 1 + drivers/clk/clkdev.c | 1 + drivers/media/platform/exynos4-is/media-dev.c | 1 + include/linux/clk-provider.h | 23 +++++++++++++++++++++++ include/linux/clk/zynq.h | 1 + 9 files changed, 31 insertions(+)
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index bf852d7..0f9e479 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c@@ -21,6 +21,7 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/err.h> #include <linux/delay.h> #include <linux/of.h>
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index 01ef59d..fbe8cf0 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c@@ -32,6 +32,7 @@ #include <linux/io.h> #include <linux/clk.h> #include <linux/clkdev.h> +#include <linux/clk-provider.h> #include <linux/pm_runtime.h> #include <linux/of.h> #include <linux/notifier.h>
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 3ec6e8e..961b593 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c@@ -15,6 +15,7 @@ #include <linux/serial_8250.h> #include <linux/ata_platform.h> #include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/mv643xx_eth.h> #include <linux/mv643xx_i2c.h>
diff --git a/drivers/clk/berlin/bg2.c b/drivers/clk/berlin/bg2.c
index 515fb13..4c81e09 100644
--- a/drivers/clk/berlin/bg2.c
+++ b/drivers/clk/berlin/bg2.c@@ -19,6 +19,7 @@ #include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/clkdev.h> #include <linux/kernel.h> #include <linux/of.h> #include <linux/of_address.h>
diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c
index 21784e4..748da9b 100644
--- a/drivers/clk/berlin/bg2q.c
+++ b/drivers/clk/berlin/bg2q.c@@ -19,6 +19,7 @@ #include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/clkdev.h> #include <linux/kernel.h> #include <linux/of.h> #include <linux/of_address.h>
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index f890b90..000c1ae 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c@@ -18,6 +18,7 @@ #include <linux/string.h> #include <linux/mutex.h> #include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/of.h>
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
index 344718d..2620c48 100644
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c@@ -13,6 +13,7 @@ #include <linux/bug.h> #include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/clkdev.h> #include <linux/device.h> #include <linux/errno.h> #include <linux/i2c.h>
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 0c287db..8e4a58d 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h@@ -16,6 +16,29 @@ #ifdef CONFIG_COMMON_CLK +/* Temporarily map the to-be-added API to the old API, just so stuff compiles */ +#define clk_core clk + +#define __clk_create_clk + +#define clk_provider_get clk_get +#define clk_provider_get_sys clk_get_sys +#define devm_clk_provider_get devm_clk_get +#define of_clk_provider_get of_clk_get +#define of_clk_provider_get_by_name of_clk_get_by_name + +#define clk_provider_set_rate clk_set_rate +#define clk_provider_get_rate clk_get_rate +#define clk_provider_round_rate clk_round_rate +#define clk_provider_set_parent clk_set_parent +#define clk_provider_get_parent clk_get_parent +#define clk_provider_prepare clk_prepare +#define clk_provider_unprepare clk_unprepare +#define clk_provider_enable clk_enable +#define clk_provider_disable clk_disable +#define clk_provider_prepare_enable clk_prepare_enable +#define clk_provider_disable_unprepare clk_unprepare + /* * flags used across common struct clk. these flags should only affect the * top-level framework. custom flags for dealing with hardware specifics
diff --git a/include/linux/clk/zynq.h b/include/linux/clk/zynq.h
index 7a5633b..a990a59 100644
--- a/include/linux/clk/zynq.h
+++ b/include/linux/clk/zynq.h@@ -21,6 +21,7 @@ #define __LINUX_CLK_ZYNQ_H_ #include <linux/spinlock.h> +#include <linux/clk-provider.h> void zynq_clock_init(void);
--
1.9.3