From: Dmitry Osipenko <digetx@gmail.com> To: Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, Georgi Djakov <georgi.djakov@linaro.org>, Rob Herring <robh+dt@kernel.org>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Peter De Schrijver <pdeschrijver@nvidia.com>, MyungJoo Ham <myungjoo.ham@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com>, Chanwoo Choi <cw00.choi@samsung.com>, Mikko Perttunen <cyndis@kapsi.fi>, Viresh Kumar <vireshk@kernel.org>, Peter Geis <pgwipeout@gmail.com>, Nicolas Chauvet <kwizart@gmail.com>, Krzysztof Kozlowski <krzk@kernel.org> Cc: linux-tegra@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v8 03/26] memory: tegra20-emc: Factor out clk initialization Date: Wed, 11 Nov 2020 04:14:33 +0300 [thread overview] Message-ID: <20201111011456.7875-4-digetx@gmail.com> (raw) In-Reply-To: <20201111011456.7875-1-digetx@gmail.com> Factor out clk initialization and make it resource-managed. This makes easier to follow code and will help to make further changes cleaner. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- drivers/memory/tegra/tegra20-emc.c | 70 ++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c index bb3f315c9587..d01b556a6d06 100644 --- a/drivers/memory/tegra/tegra20-emc.c +++ b/drivers/memory/tegra/tegra20-emc.c @@ -960,6 +960,49 @@ static int tegra_emc_opp_table_init(struct tegra_emc *emc) return err; } +static void devm_tegra_emc_unset_callback(void *data) +{ + tegra20_clk_set_emc_round_callback(NULL, NULL); +} + +static void devm_tegra_emc_unreg_clk_notifier(void *data) +{ + struct tegra_emc *emc = data; + + clk_notifier_unregister(emc->clk, &emc->clk_nb); +} + +static int tegra_emc_init_clk(struct tegra_emc *emc) +{ + int err; + + tegra20_clk_set_emc_round_callback(emc_round_rate, emc); + + err = devm_add_action_or_reset(emc->dev, devm_tegra_emc_unset_callback, + NULL); + if (err) + return err; + + emc->clk = devm_clk_get(emc->dev, NULL); + if (IS_ERR(emc->clk)) { + dev_err(emc->dev, "failed to get EMC clock: %pe\n", emc->clk); + return PTR_ERR(emc->clk); + } + + err = clk_notifier_register(emc->clk, &emc->clk_nb); + if (err) { + dev_err(emc->dev, "failed to register clk notifier: %d\n", err); + return err; + } + + err = devm_add_action_or_reset(emc->dev, + devm_tegra_emc_unreg_clk_notifier, emc); + if (err) + return err; + + return 0; +} + static int tegra_emc_probe(struct platform_device *pdev) { struct device_node *np; @@ -1003,25 +1046,13 @@ 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); - 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); - goto unset_cb; - } + err = tegra_emc_init_clk(emc); + if (err) + return err; err = tegra_emc_opp_table_init(emc); if (err) - goto unreg_notifier; + return err; platform_set_drvdata(pdev, emc); tegra_emc_rate_requests_init(emc); @@ -1036,13 +1067,6 @@ static int tegra_emc_probe(struct platform_device *pdev) try_module_get(THIS_MODULE); return 0; - -unreg_notifier: - clk_notifier_unregister(emc->clk, &emc->clk_nb); -unset_cb: - tegra20_clk_set_emc_round_callback(NULL, NULL); - - return err; } static const struct of_device_id tegra_emc_of_match[] = { -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Osipenko <digetx@gmail.com> To: Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, Georgi Djakov <georgi.djakov@linaro.org>, Rob Herring <robh+dt@kernel.org>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Peter De Schrijver <pdeschrijver@nvidia.com>, MyungJoo Ham <myungjoo.ham@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com>, Chanwoo Choi <cw00.choi@samsung.com>, Mikko Perttunen <cyndis@kapsi.fi>, Viresh Kumar <vireshk@kernel.org>, Peter Geis <pgwipeout@gmail.com>, Nicolas Chauvet <kwizart@gmail.com>, Krzysztof Kozlowski <krzk@kernel.org> Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-pm@vger.kernel.org Subject: [PATCH v8 03/26] memory: tegra20-emc: Factor out clk initialization Date: Wed, 11 Nov 2020 04:14:33 +0300 [thread overview] Message-ID: <20201111011456.7875-4-digetx@gmail.com> (raw) In-Reply-To: <20201111011456.7875-1-digetx@gmail.com> Factor out clk initialization and make it resource-managed. This makes easier to follow code and will help to make further changes cleaner. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- drivers/memory/tegra/tegra20-emc.c | 70 ++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c index bb3f315c9587..d01b556a6d06 100644 --- a/drivers/memory/tegra/tegra20-emc.c +++ b/drivers/memory/tegra/tegra20-emc.c @@ -960,6 +960,49 @@ static int tegra_emc_opp_table_init(struct tegra_emc *emc) return err; } +static void devm_tegra_emc_unset_callback(void *data) +{ + tegra20_clk_set_emc_round_callback(NULL, NULL); +} + +static void devm_tegra_emc_unreg_clk_notifier(void *data) +{ + struct tegra_emc *emc = data; + + clk_notifier_unregister(emc->clk, &emc->clk_nb); +} + +static int tegra_emc_init_clk(struct tegra_emc *emc) +{ + int err; + + tegra20_clk_set_emc_round_callback(emc_round_rate, emc); + + err = devm_add_action_or_reset(emc->dev, devm_tegra_emc_unset_callback, + NULL); + if (err) + return err; + + emc->clk = devm_clk_get(emc->dev, NULL); + if (IS_ERR(emc->clk)) { + dev_err(emc->dev, "failed to get EMC clock: %pe\n", emc->clk); + return PTR_ERR(emc->clk); + } + + err = clk_notifier_register(emc->clk, &emc->clk_nb); + if (err) { + dev_err(emc->dev, "failed to register clk notifier: %d\n", err); + return err; + } + + err = devm_add_action_or_reset(emc->dev, + devm_tegra_emc_unreg_clk_notifier, emc); + if (err) + return err; + + return 0; +} + static int tegra_emc_probe(struct platform_device *pdev) { struct device_node *np; @@ -1003,25 +1046,13 @@ 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); - 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); - goto unset_cb; - } + err = tegra_emc_init_clk(emc); + if (err) + return err; err = tegra_emc_opp_table_init(emc); if (err) - goto unreg_notifier; + return err; platform_set_drvdata(pdev, emc); tegra_emc_rate_requests_init(emc); @@ -1036,13 +1067,6 @@ static int tegra_emc_probe(struct platform_device *pdev) try_module_get(THIS_MODULE); return 0; - -unreg_notifier: - clk_notifier_unregister(emc->clk, &emc->clk_nb); -unset_cb: - tegra20_clk_set_emc_round_callback(NULL, NULL); - - return err; } static const struct of_device_id tegra_emc_of_match[] = { -- 2.29.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-11-11 1:15 UTC|newest] Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-11 1:14 [PATCH v8 00/26] Introduce memory interconnect for NVIDIA Tegra SoCs Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 01/26] memory: tegra: Correct stub of devm_tegra_memory_controller_get() Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-14 15:36 ` Krzysztof Kozlowski 2020-11-14 15:36 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 02/26] memory: tegra20-emc: Use dev_pm_opp_set_clkname() Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 5:45 ` Viresh Kumar 2020-11-11 5:45 ` Viresh Kumar 2020-11-11 5:54 ` Viresh Kumar 2020-11-11 5:54 ` Viresh Kumar 2020-11-11 6:15 ` Dmitry Osipenko 2020-11-11 6:15 ` Dmitry Osipenko 2020-11-14 15:37 ` Krzysztof Kozlowski 2020-11-14 15:37 ` Krzysztof Kozlowski 2020-11-11 1:14 ` Dmitry Osipenko [this message] 2020-11-11 1:14 ` [PATCH v8 03/26] memory: tegra20-emc: Factor out clk initialization Dmitry Osipenko 2020-11-14 15:37 ` Krzysztof Kozlowski 2020-11-14 15:37 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 04/26] memory: tegra20-emc: Add devfreq support Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 2:23 ` Chanwoo Choi 2020-11-11 2:23 ` Chanwoo Choi 2020-11-14 15:38 ` Krzysztof Kozlowski 2020-11-14 15:38 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 05/26] memory: tegra20-emc: Remove IRQ number from error message Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-14 15:38 ` Krzysztof Kozlowski 2020-11-14 15:38 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 06/26] memory: tegra30: Add FIFO sizes to memory clients Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-14 15:39 ` Krzysztof Kozlowski 2020-11-14 15:39 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 07/26] memory: tegra30-emc: Make driver modular Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-14 15:41 ` Krzysztof Kozlowski 2020-11-14 15:41 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 08/26] memory: tegra30-emc: Continue probing if timings are missing in device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-14 15:42 ` Krzysztof Kozlowski 2020-11-14 15:42 ` Krzysztof Kozlowski 2020-11-15 9:25 ` Dmitry Osipenko 2020-11-15 9:25 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 09/26] memory: tegra30: Support interconnect framework Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 5:53 ` Viresh Kumar 2020-11-11 5:53 ` Viresh Kumar 2020-11-11 6:14 ` Dmitry Osipenko 2020-11-11 6:14 ` Dmitry Osipenko 2020-11-11 6:18 ` Viresh Kumar 2020-11-11 6:18 ` Viresh Kumar 2020-11-11 7:32 ` Dmitry Osipenko 2020-11-11 7:32 ` Dmitry Osipenko 2020-11-11 7:54 ` Viresh Kumar 2020-11-11 7:54 ` Viresh Kumar 2020-11-11 14:08 ` Dmitry Osipenko 2020-11-11 14:08 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 10/26] memory: tegra30-emc: Factor out clk initialization Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 8:51 ` Krzysztof Kozlowski 2020-11-11 8:51 ` Krzysztof Kozlowski 2020-11-11 8:52 ` Krzysztof Kozlowski 2020-11-11 8:52 ` Krzysztof Kozlowski 2020-11-11 9:01 ` Dmitry Osipenko 2020-11-11 9:01 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 11/26] memory: tegra124-emc: Make driver modular Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 9:04 ` Krzysztof Kozlowski 2020-11-11 9:04 ` Krzysztof Kozlowski 2020-11-11 9:17 ` Dmitry Osipenko 2020-11-11 9:17 ` Dmitry Osipenko 2020-11-11 9:26 ` Krzysztof Kozlowski 2020-11-11 9:26 ` Krzysztof Kozlowski 2020-11-11 10:25 ` Dmitry Osipenko 2020-11-11 10:25 ` Dmitry Osipenko 2020-11-11 11:53 ` Dmitry Osipenko 2020-11-11 11:53 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 12/26] memory: tegra124-emc: Continue probing if timings are missing in device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 13/26] memory: tegra124: Support interconnect framework Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 14/26] drm/tegra: dc: Support memory bandwidth management Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 15/26] drm/tegra: dc: Extend debug stats with total number of events Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 16/26] PM / devfreq: tegra30: Support interconnect and OPPs from device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 17/26] PM / devfreq: tegra30: Separate configurations per-SoC generation Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 18/26] PM / devfreq: tegra20: Deprecate in a favor of emc-stat based driver Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 19/26] ARM: tegra: Correct EMC registers size in Tegra20 device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 20/26] ARM: tegra: Add interconnect properties to " Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 21/26] ARM: tegra: Add interconnect properties to Tegra30 device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 22/26] ARM: tegra: Add interconnect properties to Tegra124 device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 23/26] ARM: tegra: Add nvidia,memory-controller phandle to Tegra20 EMC device-tree Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 23/26] ARM: tegra: Add nvidia, memory-controller " Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 24/26] ARM: tegra: Add DVFS properties to Tegra20 EMC device-tree node Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 25/26] ARM: tegra: Add DVFS properties to Tegra30 EMC and ACTMON device-tree nodes Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 26/26] ARM: tegra: Add DVFS properties to Tegra124 " Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201111011456.7875-4-digetx@gmail.com \ --to=digetx@gmail.com \ --cc=cw00.choi@samsung.com \ --cc=cyndis@kapsi.fi \ --cc=dri-devel@lists.freedesktop.org \ --cc=georgi.djakov@linaro.org \ --cc=jonathanh@nvidia.com \ --cc=krzk@kernel.org \ --cc=kwizart@gmail.com \ --cc=kyungmin.park@samsung.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=mturquette@baylibre.com \ --cc=myungjoo.ham@samsung.com \ --cc=pdeschrijver@nvidia.com \ --cc=pgwipeout@gmail.com \ --cc=robh+dt@kernel.org \ --cc=sboyd@kernel.org \ --cc=thierry.reding@gmail.com \ --cc=vireshk@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.