| Message ID | 20210913132102.883361-1-dinguyen@kernel.org |
|---|---|
| State | Accepted |
| Commit | 09540fa337196be20e9f0241652364f09275d374 |
| Headers | show |
| Series | clk: socfpga: agilex: fix duplicate s2f_user0_clk | expand |
Quoting Dinh Nguyen (2021-09-13 06:21:02) > Remove the duplicate s2f_user0_clk. To fix what in particular? The patch is tagged for stable so I can only imagine there's some badness that would be good to fix? > > Fixes: f817c132db67 ("clk: socfpga: agilex: fix up s2f_user0_clk > representation") > Cc: stable@vger.kernel.org > Signed-off-by: Dinh Nguyen <dinguyen@kernel.org> > ---
Quoting Stephen Boyd (2021-09-14 18:16:08) > Quoting Dinh Nguyen (2021-09-13 06:21:02) > > Remove the duplicate s2f_user0_clk. > > To fix what in particular? The patch is tagged for stable so I can only > imagine there's some badness that would be good to fix? > Ah this is the patch that was missing. Please squash the two together and resend with more info.
On 9/14/21 8:35 PM, Stephen Boyd wrote: > Quoting Stephen Boyd (2021-09-14 18:16:08) >> Quoting Dinh Nguyen (2021-09-13 06:21:02) >>> Remove the duplicate s2f_user0_clk. >> >> To fix what in particular? The patch is tagged for stable so I can only >> imagine there's some badness that would be good to fix? >> > > Ah this is the patch that was missing. Please squash the two together > and resend with more info. > Sorry about that. Will do. Dinh
diff --git a/drivers/clk/socfpga/clk-agilex.c b/drivers/clk/socfpga/clk-agilex.c index 242e94c0cf8a..b4d300fbbc66 100644 --- a/drivers/clk/socfpga/clk-agilex.c +++ b/drivers/clk/socfpga/clk-agilex.c @@ -312,8 +312,6 @@ static const struct stratix10_gate_clock agilex_gate_clks[] = { 4, 0x44, 28, 1, 0, 0, 0}, { AGILEX_CS_TIMER_CLK, "cs_timer_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, 5, 0, 0, 0, 0x30, 1, 0}, - { AGILEX_S2F_USER0_CLK, "s2f_user0_clk", NULL, s2f_usr0_mux, ARRAY_SIZE(s2f_usr0_mux), 0, 0x24, - 6, 0, 0, 0, 0, 0, 0}, { AGILEX_EMAC0_CLK, "emac0_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0x7C, 0, 0, 0, 0, 0x94, 26, 0}, { AGILEX_EMAC1_CLK, "emac1_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0x7C,
Remove the duplicate s2f_user0_clk. Fixes: f817c132db67 ("clk: socfpga: agilex: fix up s2f_user0_clk representation") Cc: stable@vger.kernel.org Signed-off-by: Dinh Nguyen <dinguyen@kernel.org> --- drivers/clk/socfpga/clk-agilex.c | 2 -- 1 file changed, 2 deletions(-)