clk: meson: g12a: add CTS_ENCL & CTS_ENCL_SEL clocks
authorNeil Armstrong <neil.armstrong@linaro.org>
Fri, 24 Nov 2023 08:41:17 +0000 (09:41 +0100)
committerJerome Brunet <jbrunet@baylibre.com>
Fri, 24 Nov 2023 16:07:40 +0000 (17:07 +0100)
Add new CTS_ENCL & CTS_ENCL_SEL clocks for the G12A compatible
SoCs, they are used to feed the VPU LCD Pixel encoder used for
DSI display purposes.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20231124-amlogic-v6-4-upstream-dsi-ccf-vim3-v9-6-95256ed139e6@linaro.org
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
drivers/clk/meson/g12a.c

index f373a8d48b1d3b5a1921a0119917f40883dfeb6f..cadd824336ad01ebca3774c7dda631e157db25dc 100644 (file)
@@ -3549,6 +3549,22 @@ static struct clk_regmap g12a_cts_encp_sel = {
        },
 };
 
+static struct clk_regmap g12a_cts_encl_sel = {
+       .data = &(struct clk_regmap_mux_data){
+               .offset = HHI_VIID_CLK_DIV,
+               .mask = 0xf,
+               .shift = 12,
+               .table = mux_table_cts_sel,
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "cts_encl_sel",
+               .ops = &clk_regmap_mux_ops,
+               .parent_hws = g12a_cts_parent_hws,
+               .num_parents = ARRAY_SIZE(g12a_cts_parent_hws),
+               .flags = CLK_SET_RATE_NO_REPARENT | CLK_GET_RATE_NOCACHE,
+       },
+};
+
 static struct clk_regmap g12a_cts_vdac_sel = {
        .data = &(struct clk_regmap_mux_data){
                .offset = HHI_VIID_CLK_DIV,
@@ -3628,6 +3644,22 @@ static struct clk_regmap g12a_cts_encp = {
        },
 };
 
+static struct clk_regmap g12a_cts_encl = {
+       .data = &(struct clk_regmap_gate_data){
+               .offset = HHI_VID_CLK_CNTL2,
+               .bit_idx = 3,
+       },
+       .hw.init = &(struct clk_init_data) {
+               .name = "cts_encl",
+               .ops = &clk_regmap_gate_ops,
+               .parent_hws = (const struct clk_hw *[]) {
+                       &g12a_cts_encl_sel.hw
+               },
+               .num_parents = 1,
+               .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
+       },
+};
+
 static struct clk_regmap g12a_cts_vdac = {
        .data = &(struct clk_regmap_gate_data){
                .offset = HHI_VID_CLK_CNTL2,
@@ -4407,10 +4439,12 @@ static struct clk_hw *g12a_hw_clks[] = {
        [CLKID_VCLK2_DIV12]             = &g12a_vclk2_div12.hw,
        [CLKID_CTS_ENCI_SEL]            = &g12a_cts_enci_sel.hw,
        [CLKID_CTS_ENCP_SEL]            = &g12a_cts_encp_sel.hw,
+       [CLKID_CTS_ENCL_SEL]            = &g12a_cts_encl_sel.hw,
        [CLKID_CTS_VDAC_SEL]            = &g12a_cts_vdac_sel.hw,
        [CLKID_HDMI_TX_SEL]             = &g12a_hdmi_tx_sel.hw,
        [CLKID_CTS_ENCI]                = &g12a_cts_enci.hw,
        [CLKID_CTS_ENCP]                = &g12a_cts_encp.hw,
+       [CLKID_CTS_ENCL]                = &g12a_cts_encl.hw,
        [CLKID_CTS_VDAC]                = &g12a_cts_vdac.hw,
        [CLKID_HDMI_TX]                 = &g12a_hdmi_tx.hw,
        [CLKID_HDMI_SEL]                = &g12a_hdmi_sel.hw,
@@ -4632,10 +4666,12 @@ static struct clk_hw *g12b_hw_clks[] = {
        [CLKID_VCLK2_DIV12]             = &g12a_vclk2_div12.hw,
        [CLKID_CTS_ENCI_SEL]            = &g12a_cts_enci_sel.hw,
        [CLKID_CTS_ENCP_SEL]            = &g12a_cts_encp_sel.hw,
+       [CLKID_CTS_ENCL_SEL]            = &g12a_cts_encl_sel.hw,
        [CLKID_CTS_VDAC_SEL]            = &g12a_cts_vdac_sel.hw,
        [CLKID_HDMI_TX_SEL]             = &g12a_hdmi_tx_sel.hw,
        [CLKID_CTS_ENCI]                = &g12a_cts_enci.hw,
        [CLKID_CTS_ENCP]                = &g12a_cts_encp.hw,
+       [CLKID_CTS_ENCL]                = &g12a_cts_encl.hw,
        [CLKID_CTS_VDAC]                = &g12a_cts_vdac.hw,
        [CLKID_HDMI_TX]                 = &g12a_hdmi_tx.hw,
        [CLKID_HDMI_SEL]                = &g12a_hdmi_sel.hw,
@@ -4892,10 +4928,12 @@ static struct clk_hw *sm1_hw_clks[] = {
        [CLKID_VCLK2_DIV12]             = &g12a_vclk2_div12.hw,
        [CLKID_CTS_ENCI_SEL]            = &g12a_cts_enci_sel.hw,
        [CLKID_CTS_ENCP_SEL]            = &g12a_cts_encp_sel.hw,
+       [CLKID_CTS_ENCL_SEL]            = &g12a_cts_encl_sel.hw,
        [CLKID_CTS_VDAC_SEL]            = &g12a_cts_vdac_sel.hw,
        [CLKID_HDMI_TX_SEL]             = &g12a_hdmi_tx_sel.hw,
        [CLKID_CTS_ENCI]                = &g12a_cts_enci.hw,
        [CLKID_CTS_ENCP]                = &g12a_cts_encp.hw,
+       [CLKID_CTS_ENCL]                = &g12a_cts_encl.hw,
        [CLKID_CTS_VDAC]                = &g12a_cts_vdac.hw,
        [CLKID_HDMI_TX]                 = &g12a_hdmi_tx.hw,
        [CLKID_HDMI_SEL]                = &g12a_hdmi_sel.hw,
@@ -5123,10 +5161,12 @@ static struct clk_regmap *const g12a_clk_regmaps[] = {
        &g12a_vclk2_div12_en,
        &g12a_cts_enci_sel,
        &g12a_cts_encp_sel,
+       &g12a_cts_encl_sel,
        &g12a_cts_vdac_sel,
        &g12a_hdmi_tx_sel,
        &g12a_cts_enci,
        &g12a_cts_encp,
+       &g12a_cts_encl,
        &g12a_cts_vdac,
        &g12a_hdmi_tx,
        &g12a_hdmi_sel,