From patchwork Mon Jun 20 13:43:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 9187439 X-Patchwork-Delegate: sboyd@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B2586075F for ; Mon, 20 Jun 2016 13:44:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 662D522B1F for ; Mon, 20 Jun 2016 13:44:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59AD72766D; Mon, 20 Jun 2016 13:44:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F043522B1F for ; Mon, 20 Jun 2016 13:44:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754621AbcFTNo5 (ORCPT ); Mon, 20 Jun 2016 09:44:57 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:34250 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754600AbcFTNou (ORCPT ); Mon, 20 Jun 2016 09:44:50 -0400 Received: by mail-lf0-f68.google.com with SMTP id l184so5520379lfl.1; Mon, 20 Jun 2016 06:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r++Jc4gY+nYdkQRLrPs8TIw+6MD5xwBDURhUg0CP90o=; b=X/V6n9ouRhBHxiWMfoB+kE45t803V7CZtQLZJe50F7ZnB4zen1jGuYr4URKpVuMypR xg/RiULVcheivqMKAsboLsQp1VbR9fFLUkwjsRAQTsJ8PMBWr6ew5szxVsUn7qcY3CBK F9c2uM3TGoy8cGaeMRoYoNLRMxszvTK47xgQpqvz2+4UZx/QecFYO5jAC6KaC6zXFnup zw5YQ8h5SkaNO6WvJ9+dg0V0iYvj2LF3NhGXbJ/9Yrze0oTB7jSbDL5c5vkKqXUURGzR PmPump8VUW98fpt6LgjeTIr17ywlx36aQOc4OacAOdEJT98atcTaLcBKBQYNAMLQLMZe 4VSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r++Jc4gY+nYdkQRLrPs8TIw+6MD5xwBDURhUg0CP90o=; b=j+YwLulk2Dw5kz4pweAjGPzYjZGAyuxZUhkguVT1qfi7/oKbXAxVf5Q0U0Lr37SHPs FBaFTHi1Mk+Cr4IwRj1m1Lp9rmS+cx8+Ya/WfI6Vq2F0rTUgOmX85MMBLiyqNSHsTC2l Jkqe1t57XtqPtlx22Omlw2yHbwynepXgoEpQzAQ6fGejGxXtULLgb65a2IrnPGdzsGZx 8KnQ94KTEgXy8aXJ8/AVoS4u/TYr7xHrQcXYVyjHifJHsb6B5WzMfZgRzDaEVn2EAymY YmML9uJZssh0AXUvxRY2XIjaEvX2FTaU/+BymCVlhcZiQKppcd5u+RB9swMa3HaYd2QO pfJw== X-Gm-Message-State: ALyK8tJk7U277bf8DYboxS0hAwl8nBS61p/r00Wm4t1KjLZ763oZyN4/Pw8Sn/xuRtdk3g== X-Received: by 10.25.26.194 with SMTP id a185mr3491603lfa.156.1466430225190; Mon, 20 Jun 2016 06:43:45 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id p10sm3452594lbr.22.2016.06.20.06.43.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jun 2016 06:43:44 -0700 (PDT) From: Ricardo Ribalda Delgado To: Stephen Boyd , Michael Turquette , s.hauer@pengutronix.de, jeremy.kerr@canonical.com, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v2 3/3] clk: fixed-rate: Convert into a module platform driver Date: Mon, 20 Jun 2016 15:43:38 +0200 Message-Id: <1466430218-6561-4-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466430218-6561-1-git-send-email-ricardo.ribalda@gmail.com> References: <1466430218-6561-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Adds support for fixed-rate clock providers which have not been enabled via of_clk_init(). This is required by Device trees overlays that introduce clocks providers. Signed-off-by: Ricardo Ribalda Delgado --- v2: Changes proposed by: Stephen Boyd -Add error check -CodeStyle on of_device_ide -Use builtin_platform_driver() drivers/clk/clk-fixed-rate.c | 71 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/drivers/clk/clk-fixed-rate.c b/drivers/clk/clk-fixed-rate.c index 8e4453eb54e8..eb51922f86f7 100644 --- a/drivers/clk/clk-fixed-rate.c +++ b/drivers/clk/clk-fixed-rate.c @@ -15,6 +15,7 @@ #include #include #include +#include /* * DOC: basic fixed-rate clock that cannot gate @@ -149,15 +150,16 @@ EXPORT_SYMBOL_GPL(clk_unregister_fixed_rate); /** * of_fixed_clk_setup() - Setup function for simple fixed rate clock */ -void of_fixed_clk_setup(struct device_node *node) +struct clk *_of_fixed_clk_setup(struct device_node *node) { struct clk *clk; const char *clk_name = node->name; u32 rate; u32 accuracy = 0; + int ret; if (of_property_read_u32(node, "clock-frequency", &rate)) - return; + return ERR_PTR(-EIO); of_property_read_u32(node, "clock-accuracy", &accuracy); @@ -165,9 +167,70 @@ void of_fixed_clk_setup(struct device_node *node) clk = clk_register_fixed_rate_with_accuracy(NULL, clk_name, NULL, 0, rate, accuracy); - if (!IS_ERR(clk)) - of_clk_add_provider(node, of_clk_src_simple_get, clk); + if (IS_ERR(clk)) + return clk; + + ret = of_clk_add_provider(node, of_clk_src_simple_get, clk); + if (ret) { + clk_unregister(clk); + return ERR_PTR(ret); + } + + return clk; +} + +void of_fixed_clk_setup(struct device_node *node) +{ + _of_fixed_clk_setup(node); } EXPORT_SYMBOL_GPL(of_fixed_clk_setup); CLK_OF_DECLARE(fixed_clk, "fixed-clock", of_fixed_clk_setup); + +static int of_fixed_clk_remove(struct platform_device *pdev) +{ + struct clk *clk = platform_get_drvdata(pdev); + + if (clk) + clk_unregister_fixed_rate(clk); + + return 0; +} + +static int of_fixed_clk_probe(struct platform_device *pdev) +{ + struct clk *clk; + + /* + * Don't do anything if of_clk_init() has already + * added this clock to the provider list + */ + if (of_clk_is_provider(pdev->dev.of_node)) + return 0; + + clk = _of_fixed_clk_setup(pdev->dev.of_node); + + if (IS_ERR(clk)) + return PTR_ERR(clk); + + platform_set_drvdata(pdev, clk); + + return 0; +} + +static const struct of_device_id of_fixed_clk_ids[] = { + { .compatible = "fixed-clock" }, + { }, +}; +MODULE_DEVICE_TABLE(of, of_fixed_clk_ids); + +static struct platform_driver of_fixed_clk_driver = { + .driver = { + .name = "of_fixed_clk", + .of_match_table = of_fixed_clk_ids, + }, + .probe = of_fixed_clk_probe, + .remove = of_fixed_clk_remove, +}; + +builtin_platform_driver(of_fixed_clk_driver); #endif