[v3,3/6] drivers: clk-qoriq: increase array size of cmux_to_group

Commit Message

Vabhav Sharma Sept. 24, 2018, 12:08 a.m. UTC

From: Yogesh Gaur <[e-mail]>

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 <[e-mail]>
Signed-off-by: Vabhav Sharma <[e-mail]>
---
 drivers/clk/clk-qoriq.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stephen Boyd Oct. 1, 2018, 10:04 p.m. UTC | #1

Subject should be "clk: qoriq: increase array size ..."

Vabhav Sharma Oct. 3, 2018, 2:25 p.m. UTC | #2

> -----Original Message-----
> From: Stephen Boyd <[e-mail]>
> Sent: Tuesday, October 2, 2018 3:34 AM
> To: Vabhav Sharma <[e-mail]>; [e-mail];
> [e-mail]; [e-mail];
> [e-mail]; [e-mail]; linux-arm-
> [e-mail]; [e-mail]; linux-kernel-
> [e-mail]; [e-mail]; linux-
> [e-mail]; [e-mail]; [e-mail];
> [e-mail]; [e-mail]; [e-mail];
> [e-mail]; [e-mail]; [e-mail];
> [e-mail]; [e-mail]
> Cc: [e-mail]; Varun Sethi <[e-mail]>; Udit Kumar
> <[e-mail]>; Yogesh Narayan Gaur
> <[e-mail]>; Vabhav Sharma <[e-mail]>
> Subject: Re: [PATCH v3 3/6] drivers: clk-qoriq: increase array size of
> cmux_to_group
> 
> Subject should be "clk: qoriq: increase array size ..."
Ok

Patch

diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c
index 3a1812f..e152bfb 100644
--- a/drivers/clk/clk-qoriq.c
+++ b/drivers/clk/clk-qoriq.c
@@ -79,7 +79,7 @@  struct clockgen_chipinfo {
 	const struct clockgen_muxinfo *cmux_groups[2];
 	const struct clockgen_muxinfo *hwaccel[NUM_HWACCEL];
 	void (*init_periph)(struct clockgen *cg);
-	int cmux_to_group[NUM_CMUX]; /* -1 terminates if fewer than NUM_CMUX */
+	int cmux_to_group[NUM_CMUX+1]; /* array should be -1 terminated */
 	u32 pll_mask;	/* 1 << n bit set if PLL n is valid */
 	u32 flags;	/* CG_xxx */
 };
@@ -601,7 +601,7 @@  static const struct clockgen_chipinfo chipinfo[] = {
 			&p4080_cmux_grp1, &p4080_cmux_grp2
 		},
 		.cmux_to_group = {
-			0, 0, 0, 0, 1, 1, 1, 1
+			0, 0, 0, 0, 1, 1, 1, 1, -1
 		},
 		.pll_mask = 0x1f,
 	},