From patchwork Mon Oct 6 23:08:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Jarzmik X-Patchwork-Id: 5039971 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 976799F30B for ; Mon, 6 Oct 2014 23:11:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A43742013D for ; Mon, 6 Oct 2014 23:11:38 +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 BC17520131 for ; Mon, 6 Oct 2014 23:11:37 +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 1XbHOn-0007T8-KG; Mon, 06 Oct 2014 23:09:01 +0000 Received: from smtp05.smtpout.orange.fr ([80.12.242.127] helo=smtp.smtpout.orange.fr) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XbHOT-0007Lh-1L for linux-arm-kernel@lists.infradead.org; Mon, 06 Oct 2014 23:08:42 +0000 Received: from localhost.localdomain ([109.222.127.212]) by mwinf5d09 with ME id zz8H1o0054b5KPR03z8LAl; Tue, 07 Oct 2014 01:08:21 +0200 X-ME-Helo: localhost.localdomain X-ME-Date: Tue, 07 Oct 2014 01:08:21 +0200 X-ME-IP: 109.222.127.212 From: Robert Jarzmik To: Mike Turquette , Haojian Zhuang , Arnd Bergmann Subject: [PATCH v1 5/5] DON'T MERGE ME: clk: pxa: migrate to the clk_core API Date: Tue, 7 Oct 2014 01:08:01 +0200 Message-Id: <1412636881-6211-6-git-send-email-robert.jarzmik@free.fr> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1412636881-6211-1-git-send-email-robert.jarzmik@free.fr> References: <1412636881-6211-1-git-send-email-robert.jarzmik@free.fr> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141006_160841_402029_A6B429CF X-CRM114-Status: GOOD ( 12.70 ) X-Spam-Score: 0.0 (/) Cc: Robert Jarzmik , linux-arm-kernel@lists.infradead.org, Daniel Mack 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.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_RP_MATCHES_RCVD, 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 After the clock framework split structure clk and clk_core, amend the pxa clock providers for the new API. This patch was tested on a pxa270 on top of Tomeu's patches v9. Signed-off-by: Robert Jarzmik --- drivers/clk/pxa/clk-pxa.c | 6 +++--- drivers/clk/pxa/clk-pxa.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/pxa/clk-pxa.c b/drivers/clk/pxa/clk-pxa.c index 4e83475..8cc29a9 100644 --- a/drivers/clk/pxa/clk-pxa.c +++ b/drivers/clk/pxa/clk-pxa.c @@ -20,7 +20,7 @@ DEFINE_SPINLOCK(lock); -static struct clk *pxa_clocks[CLK_MAX]; +static struct clk_core *pxa_clocks[CLK_MAX]; static struct clk_onecell_data onecell_data = { .clks = pxa_clocks, .clk_num = CLK_MAX, @@ -69,7 +69,7 @@ static struct clk_ops cken_mux_ops = { }; void __init clkdev_pxa_register(int ckid, const char *con_id, - const char *dev_id, struct clk *clk) + const char *dev_id, struct clk_core *clk) { if (!IS_ERR(clk) && (ckid != CLK_NONE)) pxa_clocks[ckid] = clk; @@ -81,7 +81,7 @@ int __init clk_pxa_cken_init(const struct desc_clk_cken *clks, int nb_clks) { int i; struct pxa_clk *pxa_clk; - struct clk *clk; + struct clk_core *clk; for (i = 0; i < nb_clks; i++) { pxa_clk = kzalloc(sizeof(*pxa_clk), GFP_KERNEL); diff --git a/drivers/clk/pxa/clk-pxa.h b/drivers/clk/pxa/clk-pxa.h index 3239654..e2dd28d 100644 --- a/drivers/clk/pxa/clk-pxa.h +++ b/drivers/clk/pxa/clk-pxa.h @@ -25,7 +25,7 @@ static struct clk_ops name ## _rate_ops = { \ .recalc_rate = name ## _get_rate, \ }; \ - static struct clk * __init clk_register_ ## name(void) \ + static struct clk_core * __init clk_register_ ## name(void) \ { \ return clk_register_composite(NULL, clk_name, \ name ## _parents, \ @@ -40,7 +40,7 @@ static struct clk_ops name ## _rate_ops = { \ .recalc_rate = name ## _get_rate, \ }; \ - static struct clk * __init clk_register_ ## name(void) \ + static struct clk_core * __init clk_register_ ## name(void) \ { \ return clk_register_composite(NULL, clk_name, \ name ## _parents, \ @@ -101,8 +101,8 @@ static int dummy_clk_set_parent(struct clk_hw *hw, u8 index) } extern void clkdev_pxa_register(int ckid, const char *con_id, - const char *dev_id, struct clk *clk); -extern int clk_pxa_cken_init(const struct desc_clk_cken *clks, int nb_clks); + const char *dev_id, struct clk_core *clk); +extern int clk_pxa_cken_init(struct desc_clk_cken *clks, int nb_clks); void clk_pxa_dt_common_init(struct device_node *np); #endif