Commit 7aa6c246 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Jerome Brunet
Browse files

clk: meson: g12a: Limit the HDMI PLL OD to /4 



GXBB has the HDMI PLL OD in the HHI_HDMI_PLL_CNTL2 register while for
G12A/G12B/SM1 the OD has moved to HHI_HDMI_PLL_CNTL0. At first glance
the rest of the OD setup seems identical.

However, looking at the downstream kernel sources as well as testing
shows that G12A/G12B/SM1 only supports three OD values:
- register value 0 means: divide by 1
- register value 1 means: divide by 2
- register value 2 means: divide by 4

Downstream sources are also only using OD register values 0, 1 and 2
for G12A/G12B/SM1 (while for GXBB the downstream kernel sources are also
using value 3 which means: divide by 8).

Add clk_div_table and have it replace the CLK_DIVIDER_POWER_OF_TWO flag
to make the kernel's view of this register match with how the hardware
actually works.

Fixes: 085a4ea9 ("clk: meson: g12a: add peripheral clock controller")
Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/20260105204710.447779-3-martin.blumenstingl@googlemail.com


Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
parent 5b1a4395

drivers/clk/meson/g12a.c

+14 −3
Original line number Diff line number Diff line
@@ -777,12 +777,23 @@ static struct clk_regmap g12a_hdmi_pll_dco = { 
	},

};



/*

 * G12/SM1 hdmi OD dividers are POWER_OF_TWO dividers but limited to /4.

 * A divider value of 3 should map to /8 but instead map /4 so ignore it.

 */

static const struct clk_div_table g12a_hdmi_pll_od_div_table[] = {

	{ .val = 0, .div = 1 },

	{ .val = 1, .div = 2 },

	{ .val = 2, .div = 4 },

	{ /* sentinel */ }

};



static struct clk_regmap g12a_hdmi_pll_od = {

	.data = &(struct clk_regmap_div_data){

		.offset = HHI_HDMI_PLL_CNTL0,

		.shift = 16,

		.width = 2,

		.flags = CLK_DIVIDER_POWER_OF_TWO,

		.table = g12a_hdmi_pll_od_div_table,

	},

	.hw.init = &(struct clk_init_data){

		.name = "hdmi_pll_od",
@@ -800,7 +811,7 @@ static struct clk_regmap g12a_hdmi_pll_od2 = { 
		.offset = HHI_HDMI_PLL_CNTL0,

		.shift = 18,

		.width = 2,

		.flags = CLK_DIVIDER_POWER_OF_TWO,

		.table = g12a_hdmi_pll_od_div_table,

	},

	.hw.init = &(struct clk_init_data){

		.name = "hdmi_pll_od2",
@@ -818,7 +829,7 @@ static struct clk_regmap g12a_hdmi_pll = { 
		.offset = HHI_HDMI_PLL_CNTL0,

		.shift = 20,

		.width = 2,

		.flags = CLK_DIVIDER_POWER_OF_TWO,

		.table = g12a_hdmi_pll_od_div_table,

	},

	.hw.init = &(struct clk_init_data){

		.name = "hdmi_pll",