2019-04-25 09:49:21

by Vabhav Sharma

Subject: [PATCH v2] clk: qoriq: increase array size of cmux_to_group

From: Yogesh Gaur <[email protected]>

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 <[email protected]>
Signed-off-by: Vabhav Sharma <[email protected]>
Acked-by: Scott Wood <[email protected]>
Acked-by: Stephen Boyd <[email protected]>
---
Changes for v2:
- Incorporated review comments from Stephen Boyd
- Subject line modified
- Indentation update

drivers/clk/clk-qoriq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c
index 1212a9b..3d51d7c 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,
},
--
2.7.4

2019-04-25 19:08:55

by Stephen Boyd

Subject: Re: [PATCH v2] clk: qoriq: increase array size of cmux_to_group

Quoting Vabhav Sharma (2019-04-25 02:47:48)
> From: Yogesh Gaur <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Vabhav Sharma <[email protected]>
> Acked-by: Scott Wood <[email protected]>
> Acked-by: Stephen Boyd <[email protected]>
> ---

Applied to clk-next and I added space around the +