From patchwork Wed Feb 19 10:03:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11390893 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4A242109A for ; Wed, 19 Feb 2020 10:04:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C8E024658 for ; Wed, 19 Feb 2020 10:04:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nJbCTRQD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726497AbgBSKED (ORCPT ); Wed, 19 Feb 2020 05:04:03 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:46713 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726453AbgBSKEC (ORCPT ); Wed, 19 Feb 2020 05:04:02 -0500 Received: by mail-lj1-f193.google.com with SMTP id x14so26370675ljd.13 for ; Wed, 19 Feb 2020 02:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gxi6KYGr5mqVq8fzO7WJDSPc3JwpyT1jXF3qnuigAWw=; b=nJbCTRQDnwpANyabKaPG/19zCybls6u3ODeOJgucDiBrRsrwQ3QMQyuhOaPurFINDL 9U0UoZ3fVL2ERbnh/KpcHjvAoHdTuD9O4jsNo3OLnwILNW/ZcHkWzEp7ZIwZWcfsWc2D p1E2N2rVSPQ3jhKnoXOlhgzybRfqAO9kt9RN7gIt1zaIF7oq6HJll5hI7H1EApJfonz7 B2g1naZy3xwpGBuy1FIJlpZ4JF5Tc7nW4gOW0sFMcSaGZ7fxekOSw0nD1radvAQeKCdJ zQLwMRaKHIHfZNLGtxpk9rJOcPbqN2TTgfXIVQTj0UD6F9Vb4TNaU8TFk1BIXqA47C7F Z32w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gxi6KYGr5mqVq8fzO7WJDSPc3JwpyT1jXF3qnuigAWw=; b=MGKS985hB+g2lYxnB0o2HMQkVBOG85nuDvXB8l5Zyn5eHsokCuBL1DwiUXT+3MrvK5 WMJ1inOQyrkd9fTq1HWOYkF8jqVXdOjR+3cI2J/7lm8W0Ik+f7LpsFMO3vawZqE4yV5a 68ReWW4RkaceOxDlG3NhFfZYDN/AyEv8xKzXZmagbTYXctYEGPoLygPwbV8cc1nInGwR PsDFCHMd0L68kyGyf/QF5Fjc0a7+hA715Sljec2ex89zUgObF1xZyXddTKxiZjNxwCNC Q0XzILlbO13Q/Nka76CR6hd3Gh/fOid8p9db6C4J725fdIX32zvOOF11Cz2eq3Gv4JXW Wu1A== X-Gm-Message-State: APjAAAXcQEiPBIT2IYm2OlRiKS3hwMdTanvmn8jwISYt9IeQE3USNG9m DDzAJS0S0mgFDOgu9BSNn/31hA== X-Google-Smtp-Source: APXvYqxRQGoHBZqmlCXzTgNxVMuDl3II68/RvPFDKX1WNDGxAw+Ox9rNkhWoLZzUeJaNoVA+jyYdCg== X-Received: by 2002:a2e:81d0:: with SMTP id s16mr15642739ljg.166.1582106640415; Wed, 19 Feb 2020 02:04:00 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id n1sm918913lfq.16.2020.02.19.02.03.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 02:03:59 -0800 (PST) From: Linus Walleij To: Michael Turquette , Stephen Boyd Cc: linux-clk@vger.kernel.org, Linus Walleij Subject: [PATCH 3/3 v2] clk: versatile: Add device tree probing for IM-PD1 clocks Date: Wed, 19 Feb 2020 11:03:46 +0100 Message-Id: <20200219100346.78227-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200219100346.78227-1-linus.walleij@linaro.org> References: <20200219100346.78227-1-linus.walleij@linaro.org> MIME-Version: 1.0 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org As we want to move these clocks over to probe from the device tree we add a device tree probing path. The old platform data path will be deleted once we have the device tree overall code in place. Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Drop some __init tagging - Provide MODULE_DEVICE_TABLE() - Rewrote to use the same method with regmap as clk-icst.c - The reuse of clk-icst.c makes the clock probe using hw and then it needs no special handling for clock output names. --- drivers/clk/versatile/clk-icst.h | 1 + drivers/clk/versatile/clk-impd1.c | 79 +++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/drivers/clk/versatile/clk-icst.h b/drivers/clk/versatile/clk-icst.h index 1206f008c11a..1a119ef11066 100644 --- a/drivers/clk/versatile/clk-icst.h +++ b/drivers/clk/versatile/clk-icst.h @@ -11,6 +11,7 @@ enum icst_control_type { ICST_INTEGRATOR_AP_PCI, /* Odd bit pattern storage */ ICST_INTEGRATOR_CP_CM_CORE, /* Only 8 bits of VDW and 3 bits of OD */ ICST_INTEGRATOR_CP_CM_MEM, /* Only 8 bits of VDW and 3 bits of OD */ + ICST_INTEGRATOR_IM_PD1, /* Like the Versatile, all control bits */ }; /** diff --git a/drivers/clk/versatile/clk-impd1.c b/drivers/clk/versatile/clk-impd1.c index 1991f15a5db9..b05da8516d4c 100644 --- a/drivers/clk/versatile/clk-impd1.c +++ b/drivers/clk/versatile/clk-impd1.c @@ -7,7 +7,11 @@ #include #include #include +#include #include +#include +#include +#include #include "icst.h" #include "clk-icst.h" @@ -175,3 +179,78 @@ void integrator_impd1_clk_exit(unsigned int id) kfree(imc->pclkname); } EXPORT_SYMBOL_GPL(integrator_impd1_clk_exit); + +static int integrator_impd1_clk_spawn(struct device *dev, + struct device_node *parent, + struct device_node *np) +{ + struct regmap *map; + struct clk *clk = ERR_PTR(-EINVAL); + const char *name = np->name; + const char *parent_name; + const struct clk_icst_desc *desc; + int ret; + + map = syscon_node_to_regmap(parent); + if (IS_ERR(map)) { + pr_err("no regmap for syscon IM-PD1 ICST clock parent\n"); + return PTR_ERR(map); + } + + if (of_device_is_compatible(np, "arm,impd1-vco1")) { + desc = &impd1_icst1_desc; + } else if (of_device_is_compatible(np, "arm,impd1-vco2")) { + desc = &impd1_icst2_desc; + } else { + dev_err(dev, "not a clock node %s\n", name); + return -ENODEV; + } + + parent_name = of_clk_get_parent_name(np, 0); + clk = icst_clk_setup(NULL, desc, name, parent_name, map, + ICST_INTEGRATOR_IM_PD1); + if (!IS_ERR(clk)) { + of_clk_add_provider(np, of_clk_src_simple_get, clk); + ret = 0; + } else { + dev_err(dev, "error setting up IM-PD1 ICST clock\n"); + ret = PTR_ERR(clk); + } + + return ret; +} + +static int integrator_impd1_clk_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct device_node *child; + int ret = 0; + + for_each_available_child_of_node(np, child) { + ret = integrator_impd1_clk_spawn(dev, np, child); + if (ret) + break; + } + + return ret; +} + +static const struct of_device_id impd1_syscon_match[] = { + { .compatible = "arm,im-pd1-syscon", }, + {} +}; +MODULE_DEVICE_TABLE(of, impd1_syscon_match); + +static struct platform_driver impd1_clk_driver = { + .driver = { + .name = "impd1-clk", + .of_match_table = impd1_syscon_match, + }, + .probe = integrator_impd1_clk_probe, +}; +builtin_platform_driver(impd1_clk_driver); + +MODULE_AUTHOR("Linus Walleij "); +MODULE_DESCRIPTION("Arm IM-PD1 module clock driver"); +MODULE_LICENSE("GPL v2");