From patchwork Fri Jun 27 07:57:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 4433801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 29F9E9F73E for ; Fri, 27 Jun 2014 08:01:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 103A020377 for ; Fri, 27 Jun 2014 08:01:10 +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 4AB4D20351 for ; Fri, 27 Jun 2014 08:01:09 +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 1X0R3q-0002Nm-Dg; Fri, 27 Jun 2014 07:59:06 +0000 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X0R3U-00025h-8b for linux-arm-kernel@lists.infradead.org; Fri, 27 Jun 2014 07:58:44 +0000 Received: by mail-wg0-f44.google.com with SMTP id x13so4541042wgg.3 for ; Fri, 27 Jun 2014 00:58:22 -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=81Wjrj1QoFTjcbGssJFz0olr7Th2itklxqtQULITfhM=; b=FmGUpCHsZbDYyiP79w5pFRmcsH46rb1N44M/FRtKyGSBJl3+/KmdFtJ5m21bWPVbku ty6kyumr26THxH0o5nbwLoZtXC2wbjF+qE2CJE69rscDkF3JjPW0v73XbSlDqNRT1nQE qHnT5l77ebizqb1uQyWqpuEtb1vUgsoXJbvwuAwyT4QlnhoosaOxn4W64df/4oooTmyF Sm8THBkwfTrgpiA2rCX7WdpkpjMsvHFCL38UKfQmuRSOMTw7yN1iMP1tSQyw27oT+vKd 5N38EnhxItEA3YCvlIK+JeIngTOu3FSuFr5l2eLKw1AO4eyJ0TDUpm+sTSMGJ0R9obbX 7/AA== X-Received: by 10.194.238.6 with SMTP id vg6mr21366761wjc.24.1403855902135; Fri, 27 Jun 2014 00:58:22 -0700 (PDT) Received: from localhost.localdomain (37-48-33-191.tmcz.cz. [37.48.33.191]) by mx.google.com with ESMTPSA id cj8sm19723648wjb.5.2014.06.27.00.58.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jun 2014 00:58:21 -0700 (PDT) From: Tomeu Vizoso To: Stephen Warren , Thierry Reding , Mike Turquette , Rabin Vincent , linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RFC 1/5] clk: Add temporary mapping to the existing API Date: Fri, 27 Jun 2014 09:57:48 +0200 Message-Id: <1403855872-14749-2-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403855872-14749-1-git-send-email-tomeu.vizoso@collabora.com> References: <1403855872-14749-1-git-send-email-tomeu.vizoso@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140627_005844_451153_F3CBE925 X-CRM114-Status: GOOD ( 10.40 ) X-Spam-Score: 0.0 (/) Cc: 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. Signed-off-by: Tomeu Vizoso --- Don't like this much, would be great to hear of alternatives. include/linux/clk-provider.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 0c287db..e9ccc50 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_get_internal clk_get +#define __clk_get_sys_internal clk_get_sys +#define __devm_clk_get_internal devm_clk_get +#define __of_clk_get_internal of_clk_get +#define __of_clk_get_by_name_internal of_clk_get_by_name + +#define __clk_set_rate_internal clk_set_rate +#define __clk_get_rate_internal clk_get_rate +#define __clk_set_parent_internal clk_set_parent +#define __clk_get_parent_internal clk_get_parent +#define __clk_prepare_internal clk_prepare +#define __clk_unprepare_internal clk_unprepare + /* * flags used across common struct clk. these flags should only affect the * top-level framework. custom flags for dealing with hardware specifics