Skip to content

Commit da1978a

Browse files
xdarklightjbrun3t
authored andcommitted
clk: meson: meson8b: Fix the first parent of vid_pll_in_sel
Use hdmi_pll_lvds_out as parent of the vid_pll_in_sel clock. It's not easy to see that the vendor kernel does the same, but it actually does. meson_clk_pll_ops in mainline still cannot fully recalculate all rates from the HDMI PLL registers because some register bits (at the time of writing it's unknown which bits are used for this) double the HDMI PLL output rate (compared to simply considering M, N and FRAC) for some (but not all) PLL settings. Update the vid_pll_in_sel parent so our clock calculation works for simple clock settings like the CVBS output (where no rate doubling is going on). The PLL ops need to be fixed later on for more complex clock settings (all HDMI rates). Fixes: 6cb57c6 ("clk: meson: meson8b: add the read-only video clock trees") Suggested-by: Neil Armstrong <[email protected]> Signed-off-by: Martin Blumenstingl <[email protected]> Signed-off-by: Jerome Brunet <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 6dde0ae commit da1978a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/clk/meson/meson8b.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ static struct clk_regmap meson8b_vid_pll_in_sel = {
10771077
* Meson8m2: vid2_pll
10781078
*/
10791079
.parent_hws = (const struct clk_hw *[]) {
1080-
&meson8b_hdmi_pll_dco.hw
1080+
&meson8b_hdmi_pll_lvds_out.hw
10811081
},
10821082
.num_parents = 1,
10831083
.flags = CLK_SET_RATE_PARENT,

0 commit comments

Comments
 (0)