From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68148C5B57E for ; Sun, 30 Jun 2019 21:05:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41DC0208C4 for ; Sun, 30 Jun 2019 21:05:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Hh0MQr5s" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727308AbfF3VFp (ORCPT ); Sun, 30 Jun 2019 17:05:45 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:44098 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726769AbfF3VEl (ORCPT ); Sun, 30 Jun 2019 17:04:41 -0400 Received: by mail-lf1-f65.google.com with SMTP id r15so7309705lfm.11; Sun, 30 Jun 2019 14:04:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PCQNSQK+2muyk726fUJhk7VrSnWFFmbUV5XprGSciK8=; b=Hh0MQr5s7hHy3Di97lN0kYit6pc5G6qiAf6v2BONeBsJtcl2/23d8bsVvNXVqAGgXe 6YIzlL4ExhjdS0YBHGFtLGiWiQCheCRwUB8a/6xaIgduJxD0IOf99bcPRO8+0Wp4pMbC F3Q+yCtNTEwf4Jffdq/4D6BFrcpkFYMbjaJyhi8uZywplhM+8BaNEPYcaQEJyA+fcSoR ExNm2nDA9KUUb+fcx+d43EkI/O998bcI5afiIfh2yBuN5QktfVmbNvxpCGuJWyqI72O5 iJR1uoMmRbGMZlu3giND2SOC4nq8RE5lFHmk7oYCKi2uA0ltj9F67v3bHucfW9NaDo/M GM1w== 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=PCQNSQK+2muyk726fUJhk7VrSnWFFmbUV5XprGSciK8=; b=NhrdrtGbaH/pqXNtwFciuZcul5RQYA3599Q+sLe1LO/hnhlsZzRfo0ceNRRtwTzB37 FODWR1esbOtAsw9BvY1MQx6oWeBxTHYxhtUGYXHGNNBPO9J7tFzjMDL88xhvXGgWnhrd JXauFu32xHsKiFDH35gsrXprrEvwXBjG9Jswnb7Uxh9f0+3uoekOesCVh3+PmLwDOLiT vhJPsan1GxnsjzZAv5SYvzGiykdx4QbBadLFy4BgYyhGwoOb6AsLaoL7NyrnhzdjKjpV hobcr4ujbIbc6sj0G5ZpJh35j5v6pNqgJr+M8suCU+Dry846iGxnq2RHXEcibNVaKil/ qm3Q== X-Gm-Message-State: APjAAAUxCKtbhEtX55AzY2jtH6ERvZKEFu1c4/nK5Lkgn69getRNt430 /L9nIgyvVHIcMrDlZo58nZ8= X-Google-Smtp-Source: APXvYqy0bXvI669r91+B/4o2/tfr2HOm8OJGg+PTSs6nK7OJfIs2eHN9gnzvxJhfWVrME6DPONjNIg== X-Received: by 2002:ac2:4303:: with SMTP id l3mr4501832lfh.107.1561928679651; Sun, 30 Jun 2019 14:04:39 -0700 (PDT) Received: from localhost.localdomain (ppp79-139-233-208.pppoe.spdop.ru. [79.139.233.208]) by smtp.gmail.com with ESMTPSA id u9sm2221408lfb.38.2019.06.30.14.04.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Jun 2019 14:04:39 -0700 (PDT) From: Dmitry Osipenko To: Rob Herring , Michael Turquette , Joseph Lo , Thierry Reding , Jonathan Hunter , Peter De Schrijver , Prashant Gaikwad , Stephen Boyd Cc: devicetree@vger.kernel.org, linux-clk@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 03/15] memory: tegra20-emc: Adapt for clock driver changes Date: Mon, 1 Jul 2019 00:00:07 +0300 Message-Id: <20190630210019.26914-4-digetx@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190630210019.26914-1-digetx@gmail.com> References: <20190630210019.26914-1-digetx@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Now Terga20 and Tegra30 EMC drivers should provide clock-rounding functionality using the new Tegra-CLK driver API. Acked-by: Peter De Schrijver Signed-off-by: Dmitry Osipenko --- drivers/memory/tegra/tegra20-emc.c | 50 ++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c index da8fa592b071..b519f02b0ee9 100644 --- a/drivers/memory/tegra/tegra20-emc.c +++ b/drivers/memory/tegra/tegra20-emc.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -421,6 +422,44 @@ static int emc_setup_hw(struct tegra_emc *emc) return 0; } +static long emc_round_rate(unsigned long rate, + unsigned long min_rate, + unsigned long max_rate, + void *arg) +{ + struct emc_timing *timing = NULL; + struct tegra_emc *emc = arg; + unsigned int i; + + min_rate = min(min_rate, emc->timings[emc->num_timings - 1].rate); + + for (i = 0; i < emc->num_timings; i++) { + if (emc->timings[i].rate < rate && i != emc->num_timings - 1) + continue; + + if (emc->timings[i].rate > max_rate) { + i = max(i, 1u) - 1; + + if (emc->timings[i].rate < min_rate) + break; + } + + if (emc->timings[i].rate < min_rate) + continue; + + timing = &emc->timings[i]; + break; + } + + if (!timing) { + dev_err(emc->dev, "no timing for rate %lu min %lu max %lu\n", + rate, min_rate, max_rate); + return -EINVAL; + } + + return timing->rate; +} + static int tegra_emc_probe(struct platform_device *pdev) { struct device_node *np; @@ -477,21 +516,28 @@ static int tegra_emc_probe(struct platform_device *pdev) return err; } + tegra20_clk_set_emc_round_callback(emc_round_rate, emc); + emc->clk = devm_clk_get(&pdev->dev, "emc"); if (IS_ERR(emc->clk)) { err = PTR_ERR(emc->clk); dev_err(&pdev->dev, "failed to get emc clock: %d\n", err); - return err; + goto unset_cb; } err = clk_notifier_register(emc->clk, &emc->clk_nb); if (err) { dev_err(&pdev->dev, "failed to register clk notifier: %d\n", err); - return err; + goto unset_cb; } return 0; + +unset_cb: + tegra20_clk_set_emc_round_callback(NULL, NULL); + + return err; } static const struct of_device_id tegra_emc_of_match[] = { -- 2.22.0