From patchwork Thu Jul 3 14:38:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 4474551 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 E7AAABEEAA for ; Thu, 3 Jul 2014 14:42:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E464203AA for ; Thu, 3 Jul 2014 14:42:06 +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 D728220384 for ; Thu, 3 Jul 2014 14:42:04 +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 1X2iBG-00026O-GQ; Thu, 03 Jul 2014 14:40:10 +0000 Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2iAo-0001As-IJ for linux-arm-kernel@lists.infradead.org; Thu, 03 Jul 2014 14:39:43 +0000 Received: by mail-wi0-f173.google.com with SMTP id cc10so11490561wib.6 for ; Thu, 03 Jul 2014 07:39:16 -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=YqH/gH2Iw6RQVBGkD+QzGNNQKHqA15tDsS1XpTWOq9g=; b=vUT/3m1WssPqpb3ZaLqKGVh26x7uKkKBHlmdY6UXm0HD/+ix9YsmWuGr/+hm73iJp5 PnDTdQaSU9YcPqU8HZtjPfKNCbcZMIQXZW7ouQft2HLMVFNy4SSi92lzgnIfH8rD4GMB ntvkE8kuDgnJ9+S2F388aFo0gRdAb2Sc2evMxThDRaSOJmuGLoRudOSyXSy7OkNmnniY bbg16dgDa6WIvd8Z/5UHRQUdOdqURBfq2UtL41GKzcbQTEn38NNtfGjvmd9ilSKRSe+0 Ylx7pawJBfFRwuBsWJ4Q/0bxq8KkaComzSFuBqESIf+P3rCF2MEJRpVdkJg/tLOWoCkG 6KSA== X-Received: by 10.180.89.193 with SMTP id bq1mr49907279wib.81.1404398355253; Thu, 03 Jul 2014 07:39:15 -0700 (PDT) Received: from localhost.localdomain (37-48-39-127.tmcz.cz. [37.48.39.127]) by mx.google.com with ESMTPSA id w9sm43159694wif.12.2014.07.03.07.39.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Jul 2014 07:39:14 -0700 (PDT) From: Tomeu Vizoso To: Stephen Warren , Thierry Reding , Mike Turquette , rabin@rab.in, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RFC v2 1/5] clk: Add temporary mapping to the existing API Date: Thu, 3 Jul 2014 16:38:39 +0200 Message-Id: <1404398323-18934-2-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404398323-18934-1-git-send-email-tomeu.vizoso@collabora.com> References: <1404398323-18934-1-git-send-email-tomeu.vizoso@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140703_073942_818288_9CE1FC9C X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: 0.0 (/) Cc: Javier Martinez Canillas , Tomeu Vizoso 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=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 --- drivers/clk/berlin/bg2.c | 1 + drivers/clk/berlin/bg2q.c | 1 + drivers/clk/clkdev.c | 1 + include/linux/clk-provider.h | 18 ++++++++++++++++++ include/linux/clk/zynq.h | 1 + 5 files changed, 22 insertions(+) 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/include/linux/clk-provider.h b/include/linux/clk-provider.h index 0c287db..f359f3e 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -16,6 +16,24 @@ #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_core_to_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_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 + /* * 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);