]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
clk: amlogic: add video-related clocks for S4 SoC
authorChuan Liu <chuan.liu@amlogic.com>
Fri, 19 Sep 2025 05:59:00 +0000 (13:59 +0800)
committerJerome Brunet <jbrunet@baylibre.com>
Mon, 15 Dec 2025 09:56:08 +0000 (10:56 +0100)
Add video encoder, demodulator and CVBS clocks.

Signed-off-by: Chuan Liu <chuan.liu@amlogic.com>
Link: https://lore.kernel.org/r/20250919-add_video_clk-v6-2-fe223161fb3f@amlogic.com
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
drivers/clk/meson/s4-peripherals.c

index 6d69b132d1e1f5950d73757c45b920c9c9052344..aa500ea8ef9c7e792821cebd7f13802358a44b38 100644 (file)
@@ -44,6 +44,7 @@
 #define CLKCTRL_VDIN_MEAS_CLK_CTRL                 0x0f8
 #define CLKCTRL_VAPBCLK_CTRL                       0x0fc
 #define CLKCTRL_HDCP22_CTRL                        0x100
+#define CLKCTRL_CDAC_CLK_CTRL                      0x108
 #define CLKCTRL_VDEC_CLK_CTRL                      0x140
 #define CLKCTRL_VDEC2_CLK_CTRL                     0x144
 #define CLKCTRL_VDEC3_CLK_CTRL                     0x148
@@ -1126,6 +1127,21 @@ static struct clk_regmap s4_cts_encp_sel = {
        },
 };
 
+static struct clk_regmap s4_cts_encl_sel = {
+       .data = &(struct clk_regmap_mux_data){
+               .offset = CLKCTRL_VIID_CLK_DIV,
+               .mask = 0xf,
+               .shift = 12,
+               .table = s4_cts_parents_val_table,
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "cts_encl_sel",
+               .ops = &clk_regmap_mux_ops,
+               .parent_hws = s4_cts_parents,
+               .num_parents = ARRAY_SIZE(s4_cts_parents),
+       },
+};
+
 static struct clk_regmap s4_cts_vdac_sel = {
        .data = &(struct clk_regmap_mux_data){
                .offset = CLKCTRL_VIID_CLK_DIV,
@@ -1205,6 +1221,22 @@ static struct clk_regmap s4_cts_encp = {
        },
 };
 
+static struct clk_regmap s4_cts_encl = {
+       .data = &(struct clk_regmap_gate_data){
+               .offset = CLKCTRL_VID_CLK_CTRL2,
+               .bit_idx = 3,
+       },
+       .hw.init = &(struct clk_init_data) {
+               .name = "cts_encl",
+               .ops = &clk_regmap_gate_ops,
+               .parent_hws = (const struct clk_hw *[]) {
+                       &s4_cts_encl_sel.hw
+               },
+               .num_parents = 1,
+               .flags = CLK_SET_RATE_PARENT,
+       },
+};
+
 static struct clk_regmap s4_cts_vdac = {
        .data = &(struct clk_regmap_gate_data){
                .offset = CLKCTRL_VID_CLK_CTRL2,
@@ -2735,6 +2767,165 @@ static struct clk_regmap s4_gen_clk = {
        },
 };
 
+/* CVBS DAC */
+static struct clk_regmap s4_cdac_sel = {
+       .data = &(struct clk_regmap_mux_data) {
+               .offset = CLKCTRL_CDAC_CLK_CTRL,
+               .mask = 0x3,
+               .shift = 16,
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "cdac_sel",
+               .ops = &clk_regmap_mux_ops,
+               .parent_data = (const struct clk_parent_data []) {
+                       { .fw_name = "xtal", },
+                       { .fw_name = "fclk_div5" },
+               },
+               .num_parents = 2,
+       },
+};
+
+static struct clk_regmap s4_cdac_div = {
+       .data = &(struct clk_regmap_div_data) {
+               .offset = CLKCTRL_CDAC_CLK_CTRL,
+               .shift = 0,
+               .width = 16,
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "cdac_div",
+               .ops = &clk_regmap_divider_ops,
+               .parent_hws = (const struct clk_hw *[]) {
+                       &s4_cdac_sel.hw
+               },
+               .num_parents = 1,
+               .flags = CLK_SET_RATE_PARENT,
+       },
+};
+
+static struct clk_regmap s4_cdac = {
+       .data = &(struct clk_regmap_gate_data) {
+               .offset = CLKCTRL_CDAC_CLK_CTRL,
+               .bit_idx = 20,
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "cdac",
+               .ops = &clk_regmap_gate_ops,
+               .parent_hws = (const struct clk_hw *[]) {
+                       &s4_cdac_div.hw
+               },
+               .num_parents = 1,
+               .flags = CLK_SET_RATE_PARENT,
+       },
+};
+
+static struct clk_regmap s4_demod_core_sel = {
+       .data = &(struct clk_regmap_mux_data) {
+               .offset = CLKCTRL_DEMOD_CLK_CTRL,
+               .mask = 0x3,
+               .shift = 9,
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "demod_core_sel",
+               .ops = &clk_regmap_mux_ops,
+               .parent_data = (const struct clk_parent_data []) {
+                       { .fw_name = "xtal" },
+                       { .fw_name = "fclk_div7" },
+                       { .fw_name = "fclk_div4" }
+               },
+               .num_parents = 3,
+       },
+};
+
+static struct clk_regmap s4_demod_core_div = {
+       .data = &(struct clk_regmap_div_data) {
+               .offset = CLKCTRL_DEMOD_CLK_CTRL,
+               .shift = 0,
+               .width = 7,
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "demod_core_div",
+               .ops = &clk_regmap_divider_ops,
+               .parent_hws = (const struct clk_hw *[]) {
+                       &s4_demod_core_sel.hw
+               },
+               .num_parents = 1,
+               .flags = CLK_SET_RATE_PARENT,
+       },
+};
+
+static struct clk_regmap s4_demod_core = {
+       .data = &(struct clk_regmap_gate_data) {
+               .offset = CLKCTRL_DEMOD_CLK_CTRL,
+               .bit_idx = 8
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "demod_core",
+               .ops = &clk_regmap_gate_ops,
+               .parent_hws = (const struct clk_hw *[]) {
+                       &s4_demod_core_div.hw
+               },
+               .num_parents = 1,
+               .flags = CLK_SET_RATE_PARENT,
+       },
+};
+
+/* CVBS ADC */
+static struct clk_regmap s4_adc_extclk_in_sel = {
+       .data = &(struct clk_regmap_mux_data) {
+               .offset = CLKCTRL_DEMOD_CLK_CTRL,
+               .mask = 0x7,
+               .shift = 25,
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "adc_extclk_in_sel",
+               .ops = &clk_regmap_mux_ops,
+               .parent_data = (const struct clk_parent_data []) {
+                       { .fw_name = "xtal" },
+                       { .fw_name = "fclk_div4" },
+                       { .fw_name = "fclk_div3" },
+                       { .fw_name = "fclk_div5" },
+                       { .fw_name = "fclk_div7" },
+                       { .fw_name = "mpll2" },
+                       { .fw_name = "gp0_pll" },
+                       { .fw_name = "hifi_pll" }
+               },
+               .num_parents = 8,
+       },
+};
+
+static struct clk_regmap s4_adc_extclk_in_div = {
+       .data = &(struct clk_regmap_div_data) {
+               .offset = CLKCTRL_DEMOD_CLK_CTRL,
+               .shift = 16,
+               .width = 7,
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "adc_extclk_in_div",
+               .ops = &clk_regmap_divider_ops,
+               .parent_hws = (const struct clk_hw *[]) {
+                       &s4_adc_extclk_in_sel.hw
+               },
+               .num_parents = 1,
+               .flags = CLK_SET_RATE_PARENT,
+       },
+};
+
+static struct clk_regmap s4_adc_extclk_in = {
+       .data = &(struct clk_regmap_gate_data) {
+               .offset = CLKCTRL_DEMOD_CLK_CTRL,
+               .bit_idx = 24
+       },
+       .hw.init = &(struct clk_init_data){
+               .name = "adc_extclk_in",
+               .ops = &clk_regmap_gate_ops,
+               .parent_hws = (const struct clk_hw *[]) {
+                       &s4_adc_extclk_in_div.hw
+               },
+               .num_parents = 1,
+               .flags = CLK_SET_RATE_PARENT,
+       },
+};
+
 static const struct clk_parent_data s4_pclk_parents = { .hw = &s4_sys_clk.hw };
 
 #define S4_PCLK(_name, _reg, _bit, _flags) \
@@ -3028,6 +3219,17 @@ static struct clk_hw *s4_peripherals_hw_clks[] = {
        [CLKID_HDCP22_SKPCLK_SEL]       = &s4_hdcp22_skpclk_sel.hw,
        [CLKID_HDCP22_SKPCLK_DIV]       = &s4_hdcp22_skpclk_div.hw,
        [CLKID_HDCP22_SKPCLK]           = &s4_hdcp22_skpclk.hw,
+       [CLKID_CTS_ENCL_SEL]            = &s4_cts_encl_sel.hw,
+       [CLKID_CTS_ENCL]                = &s4_cts_encl.hw,
+       [CLKID_CDAC_SEL]                = &s4_cdac_sel.hw,
+       [CLKID_CDAC_DIV]                = &s4_cdac_div.hw,
+       [CLKID_CDAC]                    = &s4_cdac.hw,
+       [CLKID_DEMOD_CORE_SEL]          = &s4_demod_core_sel.hw,
+       [CLKID_DEMOD_CORE_DIV]          = &s4_demod_core_div.hw,
+       [CLKID_DEMOD_CORE]              = &s4_demod_core.hw,
+       [CLKID_ADC_EXTCLK_IN_SEL]       = &s4_adc_extclk_in_sel.hw,
+       [CLKID_ADC_EXTCLK_IN_DIV]       = &s4_adc_extclk_in_div.hw,
+       [CLKID_ADC_EXTCLK_IN]           = &s4_adc_extclk_in.hw,
 };
 
 static const struct meson_clkc_data s4_peripherals_clkc_data = {