From: Tomeu Vizoso <tomeu.vizoso@collabora.com> To: Mike Turquette <mturquette@linaro.org> Cc: Stephen Warren <swarren@wwwdotorg.org>, Thierry Reding <thierry.reding@gmail.com>, tomasz.figa@gmail.com, Peter De Schrijver <pdeschrijver@nvidia.com>, rabin@rab.in, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Javier Martinez Canillas <javier.martinez@collabora.co.uk>, Tomeu Vizoso <tomeu.vizoso@collabora.com> Subject: [PATCH v9 1/6] clk: Add temporary mapping to the existing API Date: Wed, 3 Sep 2014 17:29:08 +0200 [thread overview] Message-ID: <1409758148-20104-2-git-send-email-tomeu.vizoso@collabora.com> (raw) In-Reply-To: <1409758148-20104-1-git-send-email-tomeu.vizoso@collabora.com> 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 <tomeu.vizoso@collabora.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Tested-by: Heiko Stuebner <heiko@sntech.de> --- v9: * Add mapping for clk_get_name v7: * Add mappings for clk_notifier_[un]register * Add more clk-provider.h includes to clk implementations 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/mach-shmobile/clock.c | 1 + arch/arm/plat-orion/common.c | 1 + drivers/clk/berlin/bg2.c | 1 + drivers/clk/berlin/bg2q.c | 1 + drivers/clk/clk-conf.c | 1 + drivers/clk/clkdev.c | 1 + drivers/media/platform/exynos4-is/media-dev.c | 1 + include/linux/clk-provider.h | 27 +++++++++++++++++++++++++++ include/linux/clk/zynq.h | 1 + 11 files changed, 37 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 d22c30d..f138a62 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/mach-shmobile/clock.c b/arch/arm/mach-shmobile/clock.c index 806f940..ed415dc 100644 --- a/arch/arm/mach-shmobile/clock.c +++ b/arch/arm/mach-shmobile/clock.c @@ -24,6 +24,7 @@ #ifdef CONFIG_COMMON_CLK #include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/clkdev.h> #include "clock.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/clk-conf.c b/drivers/clk/clk-conf.c index aad4796..d36a7b3 100644 --- a/drivers/clk/clk-conf.c +++ b/drivers/clk/clk-conf.c @@ -8,6 +8,7 @@ */ #include <linux/clk.h> +#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/clk/clk-conf.h> #include <linux/device.h> diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index da4bda8..c751d0c 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 411dd7e..99b906f 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -16,6 +16,33 @@ #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 +#define clk_provider_notifier_register clk_notifier_register +#define clk_provider_notifier_unregister clk_notifier_unregister + +#define clk_get_name __clk_get_name + /* * 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
WARNING: multiple messages have this Message-ID (diff)
From: tomeu.vizoso@collabora.com (Tomeu Vizoso) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v9 1/6] clk: Add temporary mapping to the existing API Date: Wed, 3 Sep 2014 17:29:08 +0200 [thread overview] Message-ID: <1409758148-20104-2-git-send-email-tomeu.vizoso@collabora.com> (raw) In-Reply-To: <1409758148-20104-1-git-send-email-tomeu.vizoso@collabora.com> 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 <tomeu.vizoso@collabora.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Tested-by: Heiko Stuebner <heiko@sntech.de> --- v9: * Add mapping for clk_get_name v7: * Add mappings for clk_notifier_[un]register * Add more clk-provider.h includes to clk implementations 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/mach-shmobile/clock.c | 1 + arch/arm/plat-orion/common.c | 1 + drivers/clk/berlin/bg2.c | 1 + drivers/clk/berlin/bg2q.c | 1 + drivers/clk/clk-conf.c | 1 + drivers/clk/clkdev.c | 1 + drivers/media/platform/exynos4-is/media-dev.c | 1 + include/linux/clk-provider.h | 27 +++++++++++++++++++++++++++ include/linux/clk/zynq.h | 1 + 11 files changed, 37 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 d22c30d..f138a62 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/mach-shmobile/clock.c b/arch/arm/mach-shmobile/clock.c index 806f940..ed415dc 100644 --- a/arch/arm/mach-shmobile/clock.c +++ b/arch/arm/mach-shmobile/clock.c @@ -24,6 +24,7 @@ #ifdef CONFIG_COMMON_CLK #include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/clkdev.h> #include "clock.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/clk-conf.c b/drivers/clk/clk-conf.c index aad4796..d36a7b3 100644 --- a/drivers/clk/clk-conf.c +++ b/drivers/clk/clk-conf.c @@ -8,6 +8,7 @@ */ #include <linux/clk.h> +#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/clk/clk-conf.h> #include <linux/device.h> diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index da4bda8..c751d0c 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 411dd7e..99b906f 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -16,6 +16,33 @@ #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 +#define clk_provider_notifier_register clk_notifier_register +#define clk_provider_notifier_unregister clk_notifier_unregister + +#define clk_get_name __clk_get_name + /* * 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
next prev parent reply other threads:[~2014-09-03 15:30 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-09-03 15:29 [PATCH v9 0/6] Per-user clock constraints Tomeu Vizoso 2014-09-03 15:29 ` Tomeu Vizoso 2014-09-03 15:29 ` Tomeu Vizoso [this message] 2014-09-03 15:29 ` [PATCH v9 1/6] clk: Add temporary mapping to the existing API Tomeu Vizoso 2014-09-03 15:31 ` [PATCH v9 2/6] clk: Move all drivers to use internal API Tomeu Vizoso 2014-09-03 15:31 ` Tomeu Vizoso 2014-09-08 6:13 ` Mike Turquette 2014-09-08 6:13 ` Mike Turquette 2014-09-09 6:15 ` Mike Turquette 2014-09-03 15:33 ` [PATCH v9 3/6] clk: use struct clk only for external API Tomeu Vizoso 2014-09-03 15:33 ` Tomeu Vizoso 2014-09-03 15:33 ` [PATCH v9 4/6] clk: per-user clock accounting for debug Tomeu Vizoso 2014-09-03 15:33 ` Tomeu Vizoso 2014-09-03 15:33 ` [PATCH v9 5/6] clk: Add floor and ceiling constraints to clock rates Tomeu Vizoso 2014-09-03 15:33 ` Tomeu Vizoso 2014-09-03 23:39 ` Stephen Boyd 2014-09-03 23:39 ` Stephen Boyd 2014-09-04 0:53 ` Mike Turquette 2014-09-04 0:53 ` Mike Turquette 2014-09-04 8:53 ` Tomeu Vizoso 2014-09-04 8:53 ` Tomeu Vizoso 2014-09-04 13:34 ` Tomeu Vizoso 2014-09-04 13:34 ` Tomeu Vizoso 2014-09-03 15:33 ` [PATCH v9 6/6] clk: Warn of unbalanced clk_prepare() calls Tomeu Vizoso 2014-09-03 15:33 ` Tomeu Vizoso 2014-09-03 17:26 ` [PATCH v9 0/6] Per-user clock constraints Mike Turquette 2014-09-04 8:30 ` Tomeu Vizoso 2014-09-04 8:30 ` Tomeu Vizoso
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1409758148-20104-2-git-send-email-tomeu.vizoso@collabora.com \ --to=tomeu.vizoso@collabora.com \ --cc=javier.martinez@collabora.co.uk \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mturquette@linaro.org \ --cc=pdeschrijver@nvidia.com \ --cc=rabin@rab.in \ --cc=swarren@wwwdotorg.org \ --cc=thierry.reding@gmail.com \ --cc=tomasz.figa@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.