| From 9de4a03deea0c46e8541da36160ec277399125e1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 8 Apr 2021 13:42:16 +0200 |
| Subject: clk: mvebu: armada-37xx-periph: remove .set_parent method for CPU PM |
| clock |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Marek Behún <kabel@kernel.org> |
| |
| [ Upstream commit 4e435a9dd26c46ac018997cc0562d50b1a96f372 ] |
| |
| Remove the .set_parent method in clk_pm_cpu_ops. |
| |
| This method was supposed to be needed by the armada-37xx-cpufreq driver, |
| but was never actually called due to wrong assumptions in the cpufreq |
| driver. After this was fixed in the cpufreq driver, this method is not |
| needed anymore. |
| |
| Signed-off-by: Marek Behún <kabel@kernel.org> |
| Acked-by: Stephen Boyd <sboyd@kernel.org> |
| Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com> |
| Tested-by: Pali Rohár <pali@kernel.org> |
| Tested-by: Tomasz Maciej Nowak <tmn505@gmail.com> |
| Tested-by: Anders Trier Olesen <anders.trier.olesen@gmail.com> |
| Tested-by: Philip Soares <philips@netisense.com> |
| Fixes: 2089dc33ea0e ("clk: mvebu: armada-37xx-periph: add DVFS support for cpu clocks") |
| Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/clk/mvebu/armada-37xx-periph.c | 28 -------------------------- |
| 1 file changed, 28 deletions(-) |
| |
| diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c |
| index f5746f9ea929..6507bd2c5f31 100644 |
| --- a/drivers/clk/mvebu/armada-37xx-periph.c |
| +++ b/drivers/clk/mvebu/armada-37xx-periph.c |
| @@ -440,33 +440,6 @@ static u8 clk_pm_cpu_get_parent(struct clk_hw *hw) |
| return val; |
| } |
| |
| -static int clk_pm_cpu_set_parent(struct clk_hw *hw, u8 index) |
| -{ |
| - struct clk_pm_cpu *pm_cpu = to_clk_pm_cpu(hw); |
| - struct regmap *base = pm_cpu->nb_pm_base; |
| - int load_level; |
| - |
| - /* |
| - * We set the clock parent only if the DVFS is available but |
| - * not enabled. |
| - */ |
| - if (IS_ERR(base) || armada_3700_pm_dvfs_is_enabled(base)) |
| - return -EINVAL; |
| - |
| - /* Set the parent clock for all the load level */ |
| - for (load_level = 0; load_level < LOAD_LEVEL_NR; load_level++) { |
| - unsigned int reg, mask, val, |
| - offset = ARMADA_37XX_NB_TBG_SEL_OFF; |
| - |
| - armada_3700_pm_dvfs_update_regs(load_level, ®, &offset); |
| - |
| - val = index << offset; |
| - mask = ARMADA_37XX_NB_TBG_SEL_MASK << offset; |
| - regmap_update_bits(base, reg, mask, val); |
| - } |
| - return 0; |
| -} |
| - |
| static unsigned long clk_pm_cpu_recalc_rate(struct clk_hw *hw, |
| unsigned long parent_rate) |
| { |
| @@ -592,7 +565,6 @@ static int clk_pm_cpu_set_rate(struct clk_hw *hw, unsigned long rate, |
| |
| static const struct clk_ops clk_pm_cpu_ops = { |
| .get_parent = clk_pm_cpu_get_parent, |
| - .set_parent = clk_pm_cpu_set_parent, |
| .round_rate = clk_pm_cpu_round_rate, |
| .set_rate = clk_pm_cpu_set_rate, |
| .recalc_rate = clk_pm_cpu_recalc_rate, |
| -- |
| 2.30.2 |
| |
