The branch main has been updated by manu:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e5df46055add3bcf074c9ba275ceb4481802ba04

commit e5df46055add3bcf074c9ba275ceb4481802ba04
Author:     Emmanuel Vadot <[email protected]>
AuthorDate: 2021-01-04 16:30:00 +0000
Commit:     Emmanuel Vadot <[email protected]>
CommitDate: 2021-01-04 16:30:00 +0000

    arm64: rockchip: rk_clk_mux: Tell the clk framework if we didn't change the 
clock
    
    Otherwise the clk framework will not pass the freq change request to the 
clock
    parents.
    Fix d03fd8ede2c4
    Reported by:    br
---
 sys/arm64/rockchip/clk/rk_clk_mux.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/arm64/rockchip/clk/rk_clk_mux.c 
b/sys/arm64/rockchip/clk/rk_clk_mux.c
index 2280051b5a0c..eb3cdeb99f4b 100644
--- a/sys/arm64/rockchip/clk/rk_clk_mux.c
+++ b/sys/arm64/rockchip/clk/rk_clk_mux.c
@@ -138,8 +138,10 @@ rk_clk_mux_set_freq(struct clknode *clk, uint64_t fparent, 
uint64_t *fout,
 
        sc = clknode_get_softc(clk);
 
-       if ((sc->mux_flags & RK_CLK_MUX_REPARENT) == 0)
+       if ((sc->mux_flags & RK_CLK_MUX_REPARENT) == 0) {
+               *stop = 0;
                return (0);
+       }
 
        dprintf("Finding best parent for target freq of %ju\n", *fout);
        p_names = clknode_get_parent_names(clk);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to