From patchwork Wed Jun 8 10:20:00 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: 9164143 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 9642B60832 for ; Wed, 8 Jun 2016 10:24:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86FDE28345 for ; Wed, 8 Jun 2016 10:24:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A51C28358; Wed, 8 Jun 2016 10:24:40 +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=unavailable 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 284D228345 for ; Wed, 8 Jun 2016 10:24:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424660AbcFHKYP (ORCPT ); Wed, 8 Jun 2016 06:24:15 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35102 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424575AbcFHKUI (ORCPT ); Wed, 8 Jun 2016 06:20:08 -0400 Received: by mail-lf0-f68.google.com with SMTP id s186so353254lfs.2; Wed, 08 Jun 2016 03:20:07 -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=MIz3FGaB1IqBtOqOTy5WN57Yw275yXGo3xDDDB8CFus=; b=vA6Emlc7VMPYpwmZ7/nL+4S8v2+WkH3tqBJI/f/utUKUN8HtF3fesW6DQcUGKlINf5 /zeP4J1y6CquDInBdnzN+KetS27U7HtsDDddF6L9H/rH9rTbUJSjAqKC5DH9IVNZs4Jv PyJmV4yKT40MVksv8nMK/5zu8Ok36GajV8e/yyc5OqTp0POSGsVMPKQ4Mk19rOMBV1Pt OW1DGhjYR3k2haoItTQjpwmawKGqwUd7/Vuz5msPvyW6YjAFgFfuL2mLjQR4Ht4rslqZ mz66FMtO6idMcGKRM3Bxs+mqdLKmotl9ENT12IrH7cDUzEsL6JDiAsj4lP3MVBjpBkqk KIcg== 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=MIz3FGaB1IqBtOqOTy5WN57Yw275yXGo3xDDDB8CFus=; b=EVghb/dTH/i2egOdN/S3iT4vjMXaaEpEillxjerz67Zen4XB1PrlJhPDchiM+8Cvcz M1wscafDbYX3yKU4CgVrKSW2ElmmJEbFpxrwffTosCb9Z0tJVYHFPdBhF5PHACbZb295 KC4meM+PIKeMtFP3U7W28/5w03dn8fbNaUL0QjjKBcUD8rJUkt2Y9ES3RV0huF+NdrEN ghk6T6cFzSmpRXTtvw0EUzq8yuCpLHBMq2ZRc0Y9rGfQG5hTdAysLnHI/RGq9tPkIFIT 1mJGJsqwU0upNozw4spWRX7JSJw9c3ZYO4qnP5/aNiPN3dHHhNFD5YOh1bqoOvT26drd bWCA== X-Gm-Message-State: ALyK8tKKNCKMR8HUby5/DUTPrG40nxxUZVZvkiZ6flDHR0pTlyVR22+dQK5xsFqBH0ifmQ== X-Received: by 10.25.157.130 with SMTP id g124mr4488517lfe.10.1465381206608; Wed, 08 Jun 2016 03:20:06 -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 m8sm66864lfe.15.2016.06.08.03.20.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jun 2016 03:20:05 -0700 (PDT) From: Ricardo Ribalda Delgado To: Michael Turquette , Stephen Boyd , s.hauer@pengutronix.de, jeremy.kerr@canonical.com, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH 2/3] clk: fixed-factor: Convert into a module platform driver Date: Wed, 8 Jun 2016 12:20:00 +0200 Message-Id: <1465381201-11537-3-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1465381201-11537-1-git-send-email-ricardo.ribalda@gmail.com> References: <1465381201-11537-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-factor 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 --- drivers/clk/clk-fixed-factor.c | 66 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index 75cd6c792cb8..6dfce84ef10c 100644 --- a/drivers/clk/clk-fixed-factor.c +++ b/drivers/clk/clk-fixed-factor.c @@ -12,6 +12,7 @@ #include #include #include +#include /* * DOC: basic fixed multiplier and divider clock that cannot gate @@ -145,7 +146,7 @@ EXPORT_SYMBOL_GPL(clk_hw_unregister_fixed_factor); /** * of_fixed_factor_clk_setup() - Setup function for simple fixed factor clock */ -void __init of_fixed_factor_clk_setup(struct device_node *node) +struct clk *_of_fixed_factor_clk_setup(struct device_node *node) { struct clk *clk; const char *clk_name = node->name; @@ -155,13 +156,13 @@ void __init of_fixed_factor_clk_setup(struct device_node *node) if (of_property_read_u32(node, "clock-div", &div)) { pr_err("%s Fixed factor clock <%s> must have a clock-div property\n", __func__, node->name); - return; + return ERR_PTR(-EIO); } if (of_property_read_u32(node, "clock-mult", &mult)) { pr_err("%s Fixed factor clock <%s> must have a clock-mult property\n", __func__, node->name); - return; + return ERR_PTR(-EIO); } of_property_read_string(node, "clock-output-names", &clk_name); @@ -171,8 +172,67 @@ void __init of_fixed_factor_clk_setup(struct device_node *node) mult, div); if (!IS_ERR(clk)) of_clk_add_provider(node, of_clk_src_simple_get, clk); + + return clk; +} + +void __init of_fixed_factor_clk_setup(struct device_node *node) +{ + _of_fixed_factor_clk_setup(node); + return; } EXPORT_SYMBOL_GPL(of_fixed_factor_clk_setup); CLK_OF_DECLARE(fixed_factor_clk, "fixed-factor-clock", of_fixed_factor_clk_setup); + +static int of_fixed_factor_clk_remove(struct platform_device *pdev) +{ + struct clk *clk = platform_get_drvdata(pdev); + + if (clk) + clk_unregister_fixed_factor(clk); + + return 0; +} + +static int of_fixed_factor_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_factor_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_factor_clk_ids[] = { + { + .compatible = "fixed-factor-clock", + }, + { }, +}; +MODULE_DEVICE_TABLE(of, of_fixed_factor_clk_ids); + +static struct platform_driver of_fixed_factor_clk_driver = { + .driver = { + .name = "of_fixed_factor_clk", + .of_match_table = of_fixed_factor_clk_ids, + }, + .probe = of_fixed_factor_clk_probe, + .remove = of_fixed_factor_clk_remove, +}; + +module_platform_driver(of_fixed_factor_clk_driver); + #endif