From patchwork Wed Aug 6 13:56:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 4686621 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 D5B4EC033A for ; Wed, 6 Aug 2014 13:59:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E7AE320160 for ; Wed, 6 Aug 2014 13:59:04 +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 4623C20125 for ; Wed, 6 Aug 2014 13:59:03 +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 1XF1i3-0004hW-W0; Wed, 06 Aug 2014 13:56:55 +0000 Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XF1hx-0004Y6-4J for linux-arm-kernel@lists.infradead.org; Wed, 06 Aug 2014 13:56:50 +0000 Received: by mail-we0-f174.google.com with SMTP id x48so2736932wes.19 for ; Wed, 06 Aug 2014 06:56:27 -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=UNIC32zqlO/VKn/S7Z2OZPXU4f+rzsN9ehHGTCITcZ8=; b=UtazoUAiKMXbxNoITwauodsxlbIAfS5uvaDQpXwnJhBqggs8U0uNW8O159eAzuO0ki YkRhxGIa6+y2UHczaYvj9X2hRfWip/Yb/W72+zo7dLVHAXHgJpwrSQ+ahan7SWJYuOom cJ9NC6jyXFi7GsLGTIZsoJ5iPVDtuQlw+H988T4cz/XrcB247Ctpo5muZsFiRwG2wjp5 qEigtdT69icKYzULBLHt5+SGy+Anjeg4OW1vTcYqJOSycHOSjy+HFjxa47rLQe1JjxQP Fttc5jENX20Zp+xDOwezuF21ZCRhJIsRuk0bYjPOcmF8csYMS5okWhAkoiwOA7G96jtT k9fQ== X-Received: by 10.180.12.38 with SMTP id v6mr8531375wib.31.1407333386968; Wed, 06 Aug 2014 06:56:26 -0700 (PDT) Received: from cizrna.lan (37-48-39-114.tmcz.cz. [37.48.39.114]) by mx.google.com with ESMTPSA id td10sm18621556wic.10.2014.08.06.06.56.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Aug 2014 06:56:26 -0700 (PDT) From: Tomeu Vizoso To: Mike Turquette Subject: [PATCH v5 1/6] clk: Add temporary mapping to the existing API Date: Wed, 6 Aug 2014 15:56:04 +0200 Message-Id: <1407333368-31979-2-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1407333368-31979-1-git-send-email-tomeu.vizoso@collabora.com> References: <1407333368-31979-1-git-send-email-tomeu.vizoso@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140806_065649_458199_8B2E2B94 X-CRM114-Status: GOOD ( 10.71 ) X-Spam-Score: -0.7 (/) Cc: Tomeu Vizoso , Stephen Warren , Tomasz Figa , linux-kernel@vger.kernel.org, Javier Martinez Canillas , rabin@rab.in, Thierry Reding , Peter De Schrijver , 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, 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 --- 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 #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 01ef59d..fbe8cf0 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/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/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 #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 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 +#include void zynq_clock_init(void);