summaryrefslogtreecommitdiffstats
path: root/drivers/clk/meson/meson8b.h
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2018-11-22 22:40:16 +0100
committerNeil Armstrong <narmstrong@baylibre.com>2018-11-23 15:11:58 +0100
commit700ecf7f51b2d7c9bcf6a77cc5659f293219383d (patch)
tree40acc392954509db386ec9eecbac3afc3eb5ee6c /drivers/clk/meson/meson8b.h
parent3cf94c94e81bcd5e41afcf039f98661e7698d4ca (diff)
downloadlinux-stable-700ecf7f51b2d7c9bcf6a77cc5659f293219383d.tar.gz
linux-stable-700ecf7f51b2d7c9bcf6a77cc5659f293219383d.tar.bz2
linux-stable-700ecf7f51b2d7c9bcf6a77cc5659f293219383d.zip
clk: meson: meson8b: rename cpu_div2/cpu_div3 to cpu_in_div2/cpu_in_div3
The "cpu_div2" and "cpu_div3" take "cpu_in" as input and divide that by 2 or 3. The clock controller can also generate various CPU clock post-dividers (2, 3, 4, 5, 6, 7, 8) which are derived from "cpu_clk". When adding support for these post-dividers our clock naming could be misleading as we have "cpu_div2" as well as "cpu_clk_div2". Rename the existing "cpu_in" dividers so the name of the divider's parent is part of the divider clock's name. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Acked-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Link: https://lkml.kernel.org/r/20181122214017.25643-4-martin.blumenstingl@googlemail.com
Diffstat (limited to 'drivers/clk/meson/meson8b.h')
-rw-r--r--drivers/clk/meson/meson8b.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h
index 1c6fb180e6a2..9cba34c6cb92 100644
--- a/drivers/clk/meson/meson8b.h
+++ b/drivers/clk/meson/meson8b.h
@@ -63,8 +63,8 @@
#define CLKID_MPLL1_DIV 97
#define CLKID_MPLL2_DIV 98
#define CLKID_CPU_IN_SEL 99
-#define CLKID_CPU_DIV2 100
-#define CLKID_CPU_DIV3 101
+#define CLKID_CPU_IN_DIV2 100
+#define CLKID_CPU_IN_DIV3 101
#define CLKID_CPU_SCALE_DIV 102
#define CLKID_CPU_SCALE_OUT_SEL 103
#define CLKID_MPLL_PREDIV 104