From: "Pali Rohár" <pali@kernel.org> To: Gregory Clement <gregory.clement@bootlin.com>, Andrew Lunn <andrew@lunn.ch>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: "Marek Behún" <kabel@kernel.org>, "Miquel Raynal" <miquel.raynal@bootlin.com>, "Tomasz Maciej Nowak" <tmn505@gmail.com>, "Luka Perkov" <luka.perkov@sartura.hr>, "Andre Heider" <a.heider@gmail.com>, "Vladimir Vid" <vladimir.vid@sartura.hr>, "Russell King" <rmk+kernel@armlinux.org.uk>, "Gérald Kerma" <gerald@gk2.net>, "Konstantin Porotchkin" <kostap@marvell.com> Subject: [PATCH mvebu v2 03/10] clk: mvebu: armada-37xx-periph: remove .set_parent method for CPU PM clock Date: Thu, 14 Jan 2021 13:40:25 +0100 [thread overview] Message-ID: <20210114124032.12765-4-pali@kernel.org> (raw) In-Reply-To: <20210114124032.12765-1-pali@kernel.org> From: Marek Behún <kabel@kernel.org> 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> Fixes: 2089dc33ea0e ("clk: mvebu: armada-37xx-periph: add DVFS support for cpu clocks") Cc: Gregory CLEMENT <gregory.clement@bootlin.com> Cc: Miquel Raynal <miquel.raynal@bootlin.com> --- 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.20.1
WARNING: multiple messages have this Message-ID (diff)
From: "Pali Rohár" <pali@kernel.org> To: Gregory Clement <gregory.clement@bootlin.com>, Andrew Lunn <andrew@lunn.ch>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: "Marek Behún" <kabel@kernel.org>, "Tomasz Maciej Nowak" <tmn505@gmail.com>, "Luka Perkov" <luka.perkov@sartura.hr>, "Andre Heider" <a.heider@gmail.com>, "Vladimir Vid" <vladimir.vid@sartura.hr>, "Russell King" <rmk+kernel@armlinux.org.uk>, "Gérald Kerma" <gerald@gk2.net>, "Miquel Raynal" <miquel.raynal@bootlin.com>, "Konstantin Porotchkin" <kostap@marvell.com> Subject: [PATCH mvebu v2 03/10] clk: mvebu: armada-37xx-periph: remove .set_parent method for CPU PM clock Date: Thu, 14 Jan 2021 13:40:25 +0100 [thread overview] Message-ID: <20210114124032.12765-4-pali@kernel.org> (raw) In-Reply-To: <20210114124032.12765-1-pali@kernel.org> From: Marek Behún <kabel@kernel.org> 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> Fixes: 2089dc33ea0e ("clk: mvebu: armada-37xx-periph: add DVFS support for cpu clocks") Cc: Gregory CLEMENT <gregory.clement@bootlin.com> Cc: Miquel Raynal <miquel.raynal@bootlin.com> --- 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.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-14 12:41 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-14 12:40 [PATCH mvebu v2 00/10] Armada 37xx: Fix cpufreq changing base CPU speed to 800 MHz from 1000 MHz Pali Rohár 2021-01-14 12:40 ` Pali Rohár 2021-01-14 12:40 ` [PATCH mvebu v2 01/10] arm64: dts: marvell: armada-37xx: add syscon compatible to NB clk node Pali Rohár 2021-01-14 12:40 ` Pali Rohár 2021-04-02 19:50 ` Gregory CLEMENT 2021-04-02 19:50 ` Gregory CLEMENT 2021-01-14 12:40 ` [PATCH mvebu v2 02/10] cpufreq: armada-37xx: Fix setting TBG parent for load levels Pali Rohár 2021-01-14 12:40 ` Pali Rohár 2021-01-14 12:40 ` Pali Rohár [this message] 2021-01-14 12:40 ` [PATCH mvebu v2 03/10] clk: mvebu: armada-37xx-periph: remove .set_parent method for CPU PM clock Pali Rohár 2021-02-10 1:58 ` Stephen Boyd 2021-02-10 1:58 ` Stephen Boyd 2021-01-14 12:40 ` [PATCH mvebu v2 04/10] cpufreq: armada-37xx: Fix the AVS value for loads L0 and L1 Pali Rohár 2021-01-14 12:40 ` Pali Rohár 2021-01-14 12:40 ` [PATCH mvebu v2 05/10] clk: mvebu: armada-37xx-periph: Fix switching CPU freq from 250 Mhz to 1 GHz Pali Rohár 2021-01-14 12:40 ` Pali Rohár 2021-02-10 1:58 ` Stephen Boyd 2021-02-10 1:58 ` Stephen Boyd 2021-01-14 12:40 ` [PATCH mvebu v2 06/10] clk: mvebu: armada-37xx-periph: Fix workaround for switching from L1 to L0 Pali Rohár 2021-01-14 12:40 ` Pali Rohár 2021-02-10 1:58 ` Stephen Boyd 2021-02-10 1:58 ` Stephen Boyd 2021-01-14 12:40 ` [PATCH mvebu v2 07/10] cpufreq: armada-37xx: Fix driver cleanup when registration failed Pali Rohár 2021-01-14 12:40 ` Pali Rohár 2021-01-14 12:40 ` [PATCH mvebu v2 08/10] cpufreq: armada-37xx: Fix determining base CPU frequency Pali Rohár 2021-01-14 12:40 ` Pali Rohár 2021-01-14 12:40 ` [PATCH mvebu v2 09/10] cpufreq: armada-37xx: Remove cur_frequency variable Pali Rohár 2021-01-14 12:40 ` Pali Rohár 2021-03-29 15:00 ` Gregory CLEMENT 2021-03-29 15:00 ` Gregory CLEMENT 2021-03-29 21:44 ` Marek Behún 2021-03-29 21:44 ` Marek Behún 2021-01-14 12:40 ` [PATCH mvebu v2 10/10] cpufreq: armada-37xx: Fix module unloading Pali Rohár 2021-01-14 12:40 ` Pali Rohár 2021-02-01 14:35 ` [PATCH mvebu v2 00/10] Armada 37xx: Fix cpufreq changing base CPU speed to 800 MHz from 1000 MHz Tomasz Maciej Nowak 2021-02-01 14:35 ` Tomasz Maciej Nowak 2021-02-03 19:29 ` Anders Trier Olesen 2021-02-03 19:29 ` Anders Trier Olesen 2021-02-22 19:41 ` [PATCH mvebu v3 " Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-02-22 19:41 ` [PATCH mvebu v3 01/10] arm64: dts: marvell: armada-37xx: add syscon compatible to NB clk node Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-02-22 19:41 ` [PATCH mvebu v3 02/10] cpufreq: armada-37xx: Fix setting TBG parent for load levels Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-03-29 14:45 ` Gregory CLEMENT 2021-03-29 14:45 ` Gregory CLEMENT 2021-02-22 19:41 ` [PATCH mvebu v3 03/10] clk: mvebu: armada-37xx-periph: remove .set_parent method for CPU PM clock Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-03-29 14:46 ` Gregory CLEMENT 2021-03-29 14:46 ` Gregory CLEMENT 2021-02-22 19:41 ` [PATCH mvebu v3 04/10] cpufreq: armada-37xx: Fix the AVS value for load L1 Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-03-29 14:47 ` Gregory CLEMENT 2021-03-29 14:47 ` Gregory CLEMENT 2021-02-22 19:41 ` [PATCH mvebu v3 05/10] clk: mvebu: armada-37xx-periph: Fix switching CPU freq from 250 Mhz to 1 GHz Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-03-29 14:48 ` Gregory CLEMENT 2021-03-29 14:48 ` Gregory CLEMENT 2021-02-22 19:41 ` [PATCH mvebu v3 06/10] clk: mvebu: armada-37xx-periph: Fix workaround for switching from L1 to L0 Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-03-29 14:49 ` Gregory CLEMENT 2021-03-29 14:49 ` Gregory CLEMENT 2021-02-22 19:41 ` [PATCH mvebu v3 07/10] cpufreq: armada-37xx: Fix driver cleanup when registration failed Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-03-29 14:58 ` Gregory CLEMENT 2021-03-29 14:58 ` Gregory CLEMENT 2021-02-22 19:41 ` [PATCH mvebu v3 08/10] cpufreq: armada-37xx: Fix determining base CPU frequency Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-03-29 14:59 ` Gregory CLEMENT 2021-03-29 14:59 ` Gregory CLEMENT 2021-02-22 19:41 ` [PATCH mvebu v3 09/10] cpufreq: armada-37xx: Remove cur_frequency variable Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-02-22 19:41 ` [PATCH mvebu v3 10/10] cpufreq: armada-37xx: Fix module unloading Pali Rohár 2021-02-22 19:41 ` Pali Rohár 2021-03-01 19:20 ` [PATCH mvebu v3 00/10] Armada 37xx: Fix cpufreq changing base CPU speed to 800 MHz from 1000 MHz Pali Rohár 2021-03-01 19:20 ` Pali Rohár 2021-03-12 9:12 ` Gregory CLEMENT 2021-03-12 9:12 ` Gregory CLEMENT 2021-03-12 9:27 ` Marek Behún 2021-03-12 9:27 ` Marek Behún 2021-03-28 11:31 ` Pali Rohár 2021-03-28 11:31 ` Pali Rohár 2021-04-08 0:38 ` Stephen Boyd 2021-04-08 0:38 ` Stephen Boyd
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=20210114124032.12765-4-pali@kernel.org \ --to=pali@kernel.org \ --cc=a.heider@gmail.com \ --cc=andrew@lunn.ch \ --cc=gerald@gk2.net \ --cc=gregory.clement@bootlin.com \ --cc=kabel@kernel.org \ --cc=kostap@marvell.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=luka.perkov@sartura.hr \ --cc=miquel.raynal@bootlin.com \ --cc=mturquette@baylibre.com \ --cc=rmk+kernel@armlinux.org.uk \ --cc=sboyd@kernel.org \ --cc=tmn505@gmail.com \ --cc=vladimir.vid@sartura.hr \ /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.