aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYogesh Gaur <yogeshnarayan.gaur@nxp.com>2019-04-25 05:47:48 -0400
committerStephen Boyd <sboyd@kernel.org>2019-04-25 14:41:18 -0400
commit42614b5bd9549747af5c5dbef59397b0423f1101 (patch)
tree54eaeb91d8c6bc6983b8c9d4feb87aefacad7c3e
parent008aa5fd119f00c76162de78a0bcd414af7c9fd4 (diff)
clk: qoriq: increase array size of cmux_to_group
Increase size of cmux_to_group array, to accomdate entry of -1 termination. Added -1, terminated, entry for 4080_cmux_grpX. Signed-off-by: Yogesh Gaur <yogeshnarayan.gaur@nxp.com> Signed-off-by: Vabhav Sharma <vabhav.sharma@nxp.com> Acked-by: Scott Wood <oss@buserror.net> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r--drivers/clk/clk-qoriq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c
index cd68220fd581..4739a47ec8bd 100644
--- a/drivers/clk/clk-qoriq.c
+++ b/drivers/clk/clk-qoriq.c
@@ -80,7 +80,7 @@ struct clockgen_chipinfo {
80 const struct clockgen_muxinfo *cmux_groups[2]; 80 const struct clockgen_muxinfo *cmux_groups[2];
81 const struct clockgen_muxinfo *hwaccel[NUM_HWACCEL]; 81 const struct clockgen_muxinfo *hwaccel[NUM_HWACCEL];
82 void (*init_periph)(struct clockgen *cg); 82 void (*init_periph)(struct clockgen *cg);
83 int cmux_to_group[NUM_CMUX]; /* -1 terminates if fewer than NUM_CMUX */ 83 int cmux_to_group[NUM_CMUX + 1]; /* array should be -1 terminated */
84 u32 pll_mask; /* 1 << n bit set if PLL n is valid */ 84 u32 pll_mask; /* 1 << n bit set if PLL n is valid */
85 u32 flags; /* CG_xxx */ 85 u32 flags; /* CG_xxx */
86}; 86};
@@ -669,7 +669,7 @@ static const struct clockgen_chipinfo chipinfo[] = {
669 &p4080_cmux_grp1, &p4080_cmux_grp2 669 &p4080_cmux_grp1, &p4080_cmux_grp2
670 }, 670 },
671 .cmux_to_group = { 671 .cmux_to_group = {
672 0, 0, 0, 0, 1, 1, 1, 1 672 0, 0, 0, 0, 1, 1, 1, 1, -1
673 }, 673 },
674 .pll_mask = 0x1f, 674 .pll_mask = 0x1f,
675 }, 675 },