diff options
author | Tomasz Maciej Nowak <tomek_n@o2.pl> | 2019-01-13 21:30:26 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-01-27 00:16:14 +0100 |
commit | 7d188fb4dbdc5336cf7a802a9af9355fb69b0e97 (patch) | |
tree | 99fa66d8ef3d3c1db7c9a4fe31342349b72d9e9f /target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch | |
parent | 9b1102416fff7257626fa0bcdfe2fead9f0b2aeb (diff) | |
download | upstream-7d188fb4dbdc5336cf7a802a9af9355fb69b0e97.tar.gz upstream-7d188fb4dbdc5336cf7a802a9af9355fb69b0e97.tar.bz2 upstream-7d188fb4dbdc5336cf7a802a9af9355fb69b0e97.zip |
mvebu: backport upstream fixes for armada 37xx
Upstream patches for processor frequency scaling, which fix possible
system hard lockups.
Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
Diffstat (limited to 'target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch')
-rw-r--r-- | target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch b/target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch new file mode 100644 index 0000000000..874f982bd7 --- /dev/null +++ b/target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch @@ -0,0 +1,33 @@ +From 8927c27b32703e28041ae19bf25ea53461be83a1 Mon Sep 17 00:00:00 2001 +From: Anders Roxell <anders.roxell@linaro.org> +Date: Fri, 27 Jul 2018 00:27:21 +0200 +Subject: [PATCH] clk: mvebu: armada-37xx-periph: Remove unused var num_parents +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When building armada-37xx-periph, num_parents isn't used in function +clk_pm_cpu_get_parent: +drivers/clk/mvebu/armada-37xx-periph.c: In function ‘clk_pm_cpu_get_parent’: +drivers/clk/mvebu/armada-37xx-periph.c:419:6: warning: unused variable ‘num_parents’ [-Wunused-variable] + int num_parents = clk_hw_get_num_parents(hw); + ^~~~~~~~~~~ +Remove the declaration of num_parents to dispose the warning. + +Fixes: 616bf80d381d ("clk: mvebu: armada-37xx-periph: Fix wrong return value in get_parent") +Signed-off-by: Anders Roxell <anders.roxell@linaro.org> +Signed-off-by: Stephen Boyd <sboyd@kernel.org> +--- + drivers/clk/mvebu/armada-37xx-periph.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/clk/mvebu/armada-37xx-periph.c ++++ b/drivers/clk/mvebu/armada-37xx-periph.c +@@ -419,7 +419,6 @@ static unsigned int armada_3700_pm_dvfs_ + static u8 clk_pm_cpu_get_parent(struct clk_hw *hw) + { + struct clk_pm_cpu *pm_cpu = to_clk_pm_cpu(hw); +- int num_parents = clk_hw_get_num_parents(hw); + u32 val; + + if (armada_3700_pm_dvfs_is_enabled(pm_cpu->nb_pm_base)) { |