aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeiya Wang <seiya.wang@mediatek.com>2019-02-25 01:51:12 -0500
committerStephen Boyd <sboyd@kernel.org>2019-02-26 13:17:40 -0500
commit64f4466c887e2f16cb01467c8064ff1106c980a3 (patch)
tree7c9668c4bd09e63a5e586818a16b34ea89c8bf5e
parentbfeffd155283772bbe78c6a05dec7c0128ee500c (diff)
clk: mediatek: correct cpu clock name for MT8173 SoC
Correct cpu clock name from ca57 to ca72 since MT8173 does use cortex-a72. Signed-off-by: Seiya Wang <seiya.wang@mediatek.com> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r--drivers/clk/mediatek/clk-mt8173.c4
-rw-r--r--include/dt-bindings/clock/mt8173-clk.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/clk/mediatek/clk-mt8173.c b/drivers/clk/mediatek/clk-mt8173.c
index 96c292c3e440..deedeb3ea33b 100644
--- a/drivers/clk/mediatek/clk-mt8173.c
+++ b/drivers/clk/mediatek/clk-mt8173.c
@@ -533,7 +533,7 @@ static const char * const ca53_parents[] __initconst = {
533 "univpll" 533 "univpll"
534}; 534};
535 535
536static const char * const ca57_parents[] __initconst = { 536static const char * const ca72_parents[] __initconst = {
537 "clk26m", 537 "clk26m",
538 "armca15pll", 538 "armca15pll",
539 "mainpll", 539 "mainpll",
@@ -542,7 +542,7 @@ static const char * const ca57_parents[] __initconst = {
542 542
543static const struct mtk_composite cpu_muxes[] __initconst = { 543static const struct mtk_composite cpu_muxes[] __initconst = {
544 MUX(CLK_INFRA_CA53SEL, "infra_ca53_sel", ca53_parents, 0x0000, 0, 2), 544 MUX(CLK_INFRA_CA53SEL, "infra_ca53_sel", ca53_parents, 0x0000, 0, 2),
545 MUX(CLK_INFRA_CA57SEL, "infra_ca57_sel", ca57_parents, 0x0000, 2, 2), 545 MUX(CLK_INFRA_CA72SEL, "infra_ca72_sel", ca72_parents, 0x0000, 2, 2),
546}; 546};
547 547
548static const struct mtk_composite top_muxes[] __initconst = { 548static const struct mtk_composite top_muxes[] __initconst = {
diff --git a/include/dt-bindings/clock/mt8173-clk.h b/include/dt-bindings/clock/mt8173-clk.h
index 8aea623dd518..76e4e5b65353 100644
--- a/include/dt-bindings/clock/mt8173-clk.h
+++ b/include/dt-bindings/clock/mt8173-clk.h
@@ -194,7 +194,8 @@
194#define CLK_INFRA_PMICWRAP 11 194#define CLK_INFRA_PMICWRAP 11
195#define CLK_INFRA_CLK_13M 12 195#define CLK_INFRA_CLK_13M 12
196#define CLK_INFRA_CA53SEL 13 196#define CLK_INFRA_CA53SEL 13
197#define CLK_INFRA_CA57SEL 14 197#define CLK_INFRA_CA57SEL 14 /* Deprecated. Don't use it. */
198#define CLK_INFRA_CA72SEL 14
198#define CLK_INFRA_NR_CLK 15 199#define CLK_INFRA_NR_CLK 15
199 200
200/* PERI_SYS */ 201/* PERI_SYS */