[PATCH 2/2] clk: meson: g12a: add MIPI DSI Host Pixel Clock

[Neil Armstrong]

On 25/11/2020 18:32, Jerome Brunet wrote:
> 
> On Mon 23 Nov 2020 at 17:38, Neil Armstrong <narmstrong at baylibre.com> wrote:
> 
>> This adds the MIPI DSI Host Pixel Clock, unlike AXG, the pixel clock can be different
>> from the VPU ENCL output clock to feed the DSI Host controller with a different clock rate.
>>
>> Signed-off-by: Neil Armstrong <narmstrong at baylibre.com>
> 
> Series looks good.
> 2 minor comments below 
> 
>> ---
>>  drivers/clk/meson/g12a.c | 72 ++++++++++++++++++++++++++++++++++++++++
>>  drivers/clk/meson/g12a.h |  3 +-
>>  2 files changed, 74 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
>> index 3cb8196c8e29..3dedf8408405 100644
>> --- a/drivers/clk/meson/g12a.c
>> +++ b/drivers/clk/meson/g12a.c
>> @@ -3658,6 +3658,66 @@ static struct clk_regmap g12a_hdmi_tx = {
>>  	},
>>  };
>>  
>> +/* MIPI DSI Host Clocks */
>> +
>> +static const struct clk_hw *g12a_mipi_dsi_pxclk_parent_hws[] = {
>> +	&g12a_vid_pll.hw,
>> +	&g12a_gp0_pll.hw,
>> +	&g12a_hifi_pll.hw,
>> +	&g12a_mpll1.hw,
>> +	&g12a_fclk_div2.hw,
>> +	&g12a_fclk_div2p5.hw,
>> +	&g12a_fclk_div3.hw,
>> +	&g12a_fclk_div7.hw,
>> +};
>> +
>> +static struct clk_regmap g12a_mipi_dsi_pxclk_sel = {
>> +	.data = &(struct clk_regmap_mux_data){
>> +		.offset = HHI_MIPIDSI_PHY_CLK_CNTL,
>> +		.mask = 0x7,
>> +		.shift = 12,
>> +		.flags = CLK_MUX_ROUND_CLOSEST,
>> +	},
>> +	.hw.init = &(struct clk_init_data){
>> +		.name = "mipi_dsi_pxclk_sel",
>> +		.ops = &clk_regmap_mux_ops,
>> +		.parent_hws = g12a_mipi_dsi_pxclk_parent_hws,
>> +		.num_parents = ARRAY_SIZE(g12a_mipi_dsi_pxclk_parent_hws),
>> +		.flags = CLK_SET_RATE_PARENT,
> 
> The id of the mux is exposed which seems to hint the mux will be
> manually controller but CLK_SET_RATE_NO_REPARENT is not set. Is this on
> purpose ?

You're right, it should be CLK_SET_RATE_NO_REPARENT here since we need to
control the source of the clock.

> 
>> +	},
>> +};
>> +
>> +static struct clk_regmap g12a_mipi_dsi_pxclk_div = {
>> +	.data = &(struct clk_regmap_div_data){
>> +		.offset = HHI_MIPIDSI_PHY_CLK_CNTL,
>> +		.shift = 0,
>> +		.width = 7,
>> +	},
>> +	.hw.init = &(struct clk_init_data){
>> +		.name = "mipi_dsi_pxclk_div",
>> +		.ops = &clk_regmap_divider_ops,
>> +		.parent_hws = (const struct clk_hw *[]) {
>> +					&g12a_mipi_dsi_pxclk_sel.hw },
> 
> Alignment here is weird compared to the reset of the file

ok

> 
>> +		.num_parents = 1,
>> +		.flags = CLK_SET_RATE_PARENT,
>> +	},
>> +};
>> +
>> +static struct clk_regmap g12a_mipi_dsi_pxclk = {
>> +	.data = &(struct clk_regmap_gate_data){
>> +		.offset = HHI_MIPIDSI_PHY_CLK_CNTL,
>> +		.bit_idx = 8,
>> +	},
>> +	.hw.init = &(struct clk_init_data) {
>> +		.name = "mipi_dsi_pxclk",
>> +		.ops = &clk_regmap_gate_ops,
>> +		.parent_hws = (const struct clk_hw *[]) {
>> +					&g12a_mipi_dsi_pxclk_div.hw },
>> +		.num_parents = 1,
>> +		.flags = CLK_SET_RATE_PARENT,
>> +	},
>> +};
>> +
>>  /* HDMI Clocks */
>>  
>>  static const struct clk_parent_data g12a_hdmi_parent_data[] = {
>> @@ -4403,6 +4463,9 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
>>  		[CLKID_SPICC1_SCLK_SEL]		= &g12a_spicc1_sclk_sel.hw,
>>  		[CLKID_SPICC1_SCLK_DIV]		= &g12a_spicc1_sclk_div.hw,
>>  		[CLKID_SPICC1_SCLK]		= &g12a_spicc1_sclk.hw,
>> +		[CLKID_MIPI_DSI_PXCLK_SEL]	= &g12a_mipi_dsi_pxclk_sel.hw,
>> +		[CLKID_MIPI_DSI_PXCLK_DIV]	= &g12a_mipi_dsi_pxclk_div.hw,
>> +		[CLKID_MIPI_DSI_PXCLK]		= &g12a_mipi_dsi_pxclk.hw,
>>  		[NR_CLKS]			= NULL,
>>  	},
>>  	.num = NR_CLKS,
>> @@ -4658,6 +4721,9 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
>>  		[CLKID_SPICC1_SCLK_SEL]		= &g12a_spicc1_sclk_sel.hw,
>>  		[CLKID_SPICC1_SCLK_DIV]		= &g12a_spicc1_sclk_div.hw,
>>  		[CLKID_SPICC1_SCLK]		= &g12a_spicc1_sclk.hw,
>> +		[CLKID_MIPI_DSI_PXCLK_SEL]	= &g12a_mipi_dsi_pxclk_sel.hw,
>> +		[CLKID_MIPI_DSI_PXCLK_DIV]	= &g12a_mipi_dsi_pxclk_div.hw,
>> +		[CLKID_MIPI_DSI_PXCLK]		= &g12a_mipi_dsi_pxclk.hw,
>>  		[NR_CLKS]			= NULL,
>>  	},
>>  	.num = NR_CLKS,
>> @@ -4904,6 +4970,9 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
>>  		[CLKID_NNA_CORE_CLK_SEL]	= &sm1_nna_core_clk_sel.hw,
>>  		[CLKID_NNA_CORE_CLK_DIV]	= &sm1_nna_core_clk_div.hw,
>>  		[CLKID_NNA_CORE_CLK]		= &sm1_nna_core_clk.hw,
>> +		[CLKID_MIPI_DSI_PXCLK_SEL]	= &g12a_mipi_dsi_pxclk_sel.hw,
>> +		[CLKID_MIPI_DSI_PXCLK_DIV]	= &g12a_mipi_dsi_pxclk_div.hw,
>> +		[CLKID_MIPI_DSI_PXCLK]		= &g12a_mipi_dsi_pxclk.hw,
>>  		[NR_CLKS]			= NULL,
>>  	},
>>  	.num = NR_CLKS,
>> @@ -5151,6 +5220,9 @@ static struct clk_regmap *const g12a_clk_regmaps[] = {
>>  	&sm1_nna_core_clk_sel,
>>  	&sm1_nna_core_clk_div,
>>  	&sm1_nna_core_clk,
>> +	&g12a_mipi_dsi_pxclk_sel,
>> +	&g12a_mipi_dsi_pxclk_div,
>> +	&g12a_mipi_dsi_pxclk,
>>  };
>>  
>>  static const struct reg_sequence g12a_init_regs[] = {
>> diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h
>> index 69b6a69549c7..a97613df38b3 100644
>> --- a/drivers/clk/meson/g12a.h
>> +++ b/drivers/clk/meson/g12a.h
>> @@ -264,8 +264,9 @@
>>  #define CLKID_NNA_AXI_CLK_DIV			263
>>  #define CLKID_NNA_CORE_CLK_SEL			265
>>  #define CLKID_NNA_CORE_CLK_DIV			266
>> +#define CLKID_MIPI_DSI_PXCLK_DIV		268
>>  
>> -#define NR_CLKS					268
>> +#define NR_CLKS					271
>>  
>>  /* include the CLKIDs that have been made part of the DT binding */
>>  #include <dt-bindings/clock/g12a-clkc.h>
>