Skip to content

Commit 5205628

Browse files
superna9999jbrun3t
authored andcommitted
clk: meson: g12a: add CSI & ISP gates clocks
Add the gates entries for the CSI ISP domain and CSI PHYs. [jbrunet: fixed checkpatch spelling warning] Signed-off-by: Neil Armstrong <[email protected]> Reviewed-by: Daniel Scally <[email protected]> Tested-by: Daniel Scally <[email protected]> Link: https://lore.kernel.org/r/20231114-topic-amlogic-upstream-isp-clocks-v1-3-223958791501@linaro.org Signed-off-by: Jerome Brunet <[email protected]>
1 parent 773e4e9 commit 5205628

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

drivers/clk/meson/g12a.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4306,9 +4306,12 @@ static MESON_GATE(g12a_htx_hdcp22, HHI_GCLK_MPEG2, 3);
43064306
static MESON_GATE(g12a_htx_pclk, HHI_GCLK_MPEG2, 4);
43074307
static MESON_GATE(g12a_bt656, HHI_GCLK_MPEG2, 6);
43084308
static MESON_GATE(g12a_usb1_to_ddr, HHI_GCLK_MPEG2, 8);
4309+
static MESON_GATE(g12b_mipi_isp_gate, HHI_GCLK_MPEG2, 17);
43094310
static MESON_GATE(g12a_mmc_pclk, HHI_GCLK_MPEG2, 11);
43104311
static MESON_GATE(g12a_uart2, HHI_GCLK_MPEG2, 15);
43114312
static MESON_GATE(g12a_vpu_intr, HHI_GCLK_MPEG2, 25);
4313+
static MESON_GATE(g12b_csi_phy1, HHI_GCLK_MPEG2, 28);
4314+
static MESON_GATE(g12b_csi_phy0, HHI_GCLK_MPEG2, 29);
43124315
static MESON_GATE(g12a_gic, HHI_GCLK_MPEG2, 30);
43134316

43144317
static MESON_GATE(g12a_vclk2_venci0, HHI_GCLK_OTHER, 1);
@@ -4828,6 +4831,9 @@ static struct clk_hw *g12b_hw_clks[] = {
48284831
[CLKID_MIPI_ISP_SEL] = &g12b_mipi_isp_sel.hw,
48294832
[CLKID_MIPI_ISP_DIV] = &g12b_mipi_isp_div.hw,
48304833
[CLKID_MIPI_ISP] = &g12b_mipi_isp.hw,
4834+
[CLKID_MIPI_ISP_GATE] = &g12b_mipi_isp_gate.hw,
4835+
[CLKID_MIPI_ISP_CSI_PHY0] = &g12b_csi_phy0.hw,
4836+
[CLKID_MIPI_ISP_CSI_PHY1] = &g12b_csi_phy1.hw,
48314837
};
48324838

48334839
static struct clk_hw *sm1_hw_clks[] = {
@@ -5327,6 +5333,9 @@ static struct clk_regmap *const g12a_clk_regmaps[] = {
53275333
&g12b_mipi_isp_sel,
53285334
&g12b_mipi_isp_div,
53295335
&g12b_mipi_isp,
5336+
&g12b_mipi_isp_gate,
5337+
&g12b_csi_phy1,
5338+
&g12b_csi_phy0,
53305339
};
53315340

53325341
static const struct reg_sequence g12a_init_regs[] = {

0 commit comments

Comments
 (0)