From patchwork Tue Sep 23 18:40:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 4958871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2E78EBEEA5 for ; Tue, 23 Sep 2014 18:43:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B0B82025A for ; Tue, 23 Sep 2014 18:43:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 972D720259 for ; Tue, 23 Sep 2014 18:43:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XWV1Z-0001Fl-5v; Tue, 23 Sep 2014 18:41:17 +0000 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XWV1V-00015f-NK for linux-arm-kernel@lists.infradead.org; Tue, 23 Sep 2014 18:41:14 +0000 Received: by mail-wi0-f179.google.com with SMTP id d1so5787653wiv.12 for ; Tue, 23 Sep 2014 11:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=v8gqU2UMQYf/+y+mLho2OsBZqTVCRNtENzB3rl0Dnxc=; b=0WoA8NZNx+XE7OEfWgkJYJiR9mo+ULJmoms77cfeyOQUmJaxo7l3ab2zUsivNimivs x6Xo1HVU4wX/QP6ndV2nKeNJ3v0RICBHpZtZLpObElOQ75bYOEzr0nUfOfUzHSv/+IK5 /7VKLi1BWYecFKvyUINOzPZS1nbJdn7OvnxT0ClLnKb3QWsE19svxcAeFDhnyqMS380U TPka5EmMWvY1Cvy5Y7wzEiX5jH9xD8k+5QbF/KA4MPBZ2oAMF0kpPxkTtjFbEJeWAkV5 YHtYYH3+G4dy8swb2zVQARdwzSax/GyTOkqpAGCVOIt7Hl/x44cAn8XlR4HOFsDMKwGg ZChw== X-Received: by 10.180.75.210 with SMTP id e18mr25646438wiw.6.1411497651701; Tue, 23 Sep 2014 11:40:51 -0700 (PDT) Received: from cizrna.lan (37-48-33-192.tmcz.cz. [37.48.33.192]) by mx.google.com with ESMTPSA id eq9sm3189346wic.20.2014.09.23.11.40.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Sep 2014 11:40:48 -0700 (PDT) From: Tomeu Vizoso To: Mike Turquette Subject: [PATCH v13 1/9] clk: Add temporary mapping to the existing API Date: Tue, 23 Sep 2014 20:40:13 +0200 Message-Id: <1411497613-24049-2-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1411497613-24049-1-git-send-email-tomeu.vizoso@collabora.com> References: <1411497613-24049-1-git-send-email-tomeu.vizoso@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140923_114114_120862_3A27A593 X-CRM114-Status: GOOD ( 11.47 ) X-Spam-Score: 0.0 (/) Cc: Russell King , Tomeu Vizoso , Stephen Warren , Peter De Schrijver , linux-kernel@vger.kernel.org, tomasz.figa@gmail.com, rabin@rab.in, Thierry Reding , Javier Martinez Canillas , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Tony Lindgren Acked-by: Jason Cooper Acked-by: Simon Horman Acked-by: Sebastian Hesselbarth Tested-by: Heiko Stuebner --- v13: * Add mapping for clk_provider_put 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 | 28 +++++++++++++++++++++++++++ include/linux/clk/zynq.h | 1 + 11 files changed, 38 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 #include #include +#include #include #include #include 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 #include #include +#include #include #include #include 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 +#include #include #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 #include #include +#include #include #include #include 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 #include +#include #include #include #include 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 #include +#include #include #include #include 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 +#include #include #include #include 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 #include #include +#include #include #include 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 #include #include +#include #include #include #include diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 411dd7e..03ad843 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -16,6 +16,34 @@ #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_put clk_put +#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 +#include void zynq_clock_init(void);