Skip to content

Commit 8a65268

Browse files
committed
clk: amlogic: s4: remove unused data
Following the removal of the clk_regmap clock table from the s4-peripherals clock controller driver, it appears some clocks are unused, which means these are not exported or even registered. In all likelihood, these clocks have not been tested. Remove the unused clocks for now. These can added back later when they have been properly tested. Reviewed-by: Chuan Liu <[email protected]> Link: https://lore.kernel.org/r/20250623-amlogic-clk-drop-clk-regmap-tables-v4-3-ff04918211cc@baylibre.com Signed-off-by: Jerome Brunet <[email protected]>
1 parent 4cb53ff commit 8a65268

File tree

1 file changed

+0
-112
lines changed

1 file changed

+0
-112
lines changed

drivers/clk/meson/s4-peripherals.c

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -3174,118 +3174,6 @@ static struct clk_regmap s4_gen_clk = {
31743174
},
31753175
};
31763176

3177-
static const struct clk_parent_data s4_adc_extclk_in_parent_data[] = {
3178-
{ .fw_name = "xtal", },
3179-
{ .fw_name = "fclk_div4", },
3180-
{ .fw_name = "fclk_div3", },
3181-
{ .fw_name = "fclk_div5", },
3182-
{ .fw_name = "fclk_div7", },
3183-
{ .fw_name = "mpll2", },
3184-
{ .fw_name = "gp0_pll", },
3185-
{ .fw_name = "hifi_pll", },
3186-
};
3187-
3188-
static struct clk_regmap s4_adc_extclk_in_mux = {
3189-
.data = &(struct clk_regmap_mux_data) {
3190-
.offset = CLKCTRL_DEMOD_CLK_CTRL,
3191-
.mask = 0x7,
3192-
.shift = 25,
3193-
},
3194-
.hw.init = &(struct clk_init_data){
3195-
.name = "adc_extclk_in_mux",
3196-
.ops = &clk_regmap_mux_ops,
3197-
.parent_data = s4_adc_extclk_in_parent_data,
3198-
.num_parents = ARRAY_SIZE(s4_adc_extclk_in_parent_data),
3199-
.flags = 0,
3200-
},
3201-
};
3202-
3203-
static struct clk_regmap s4_adc_extclk_in_div = {
3204-
.data = &(struct clk_regmap_div_data) {
3205-
.offset = CLKCTRL_DEMOD_CLK_CTRL,
3206-
.shift = 16,
3207-
.width = 7,
3208-
},
3209-
.hw.init = &(struct clk_init_data){
3210-
.name = "adc_extclk_in_div",
3211-
.ops = &clk_regmap_divider_ops,
3212-
.parent_hws = (const struct clk_hw *[]) {
3213-
&s4_adc_extclk_in_mux.hw
3214-
},
3215-
.num_parents = 1,
3216-
.flags = CLK_SET_RATE_PARENT,
3217-
},
3218-
};
3219-
3220-
static struct clk_regmap s4_adc_extclk_in_gate = {
3221-
.data = &(struct clk_regmap_gate_data) {
3222-
.offset = CLKCTRL_DEMOD_CLK_CTRL,
3223-
.bit_idx = 24,
3224-
},
3225-
.hw.init = &(struct clk_init_data){
3226-
.name = "adc_extclk_in",
3227-
.ops = &clk_regmap_gate_ops,
3228-
.parent_hws = (const struct clk_hw *[]) {
3229-
&s4_adc_extclk_in_div.hw
3230-
},
3231-
.num_parents = 1,
3232-
.flags = CLK_SET_RATE_PARENT,
3233-
},
3234-
};
3235-
3236-
static struct clk_regmap s4_demod_core_clk_mux = {
3237-
.data = &(struct clk_regmap_mux_data) {
3238-
.offset = CLKCTRL_DEMOD_CLK_CTRL,
3239-
.mask = 0x3,
3240-
.shift = 9,
3241-
},
3242-
.hw.init = &(struct clk_init_data){
3243-
.name = "demod_core_clk_mux",
3244-
.ops = &clk_regmap_mux_ops,
3245-
.parent_data = (const struct clk_parent_data []) {
3246-
{ .fw_name = "xtal", },
3247-
{ .fw_name = "fclk_div7", },
3248-
{ .fw_name = "fclk_div4", },
3249-
{ .hw = &s4_adc_extclk_in_gate.hw }
3250-
},
3251-
.num_parents = 4,
3252-
.flags = CLK_SET_RATE_PARENT,
3253-
},
3254-
};
3255-
3256-
static struct clk_regmap s4_demod_core_clk_div = {
3257-
.data = &(struct clk_regmap_div_data) {
3258-
.offset = CLKCTRL_DEMOD_CLK_CTRL,
3259-
.shift = 0,
3260-
.width = 7,
3261-
},
3262-
.hw.init = &(struct clk_init_data){
3263-
.name = "demod_core_clk_div",
3264-
.ops = &clk_regmap_divider_ops,
3265-
.parent_hws = (const struct clk_hw *[]) {
3266-
&s4_demod_core_clk_mux.hw
3267-
},
3268-
.num_parents = 1,
3269-
.flags = CLK_SET_RATE_PARENT,
3270-
},
3271-
};
3272-
3273-
static struct clk_regmap s4_demod_core_clk_gate = {
3274-
.data = &(struct clk_regmap_gate_data) {
3275-
.offset = CLKCTRL_DEMOD_CLK_CTRL,
3276-
.bit_idx = 8,
3277-
},
3278-
.hw.init = &(struct clk_init_data){
3279-
.name = "demod_core_clk",
3280-
.ops = &clk_regmap_gate_ops,
3281-
.parent_hws = (const struct clk_hw *[]) {
3282-
&s4_demod_core_clk_div.hw
3283-
},
3284-
.num_parents = 1,
3285-
.flags = CLK_SET_RATE_PARENT,
3286-
},
3287-
};
3288-
32893177
#define MESON_GATE(_name, _reg, _bit) \
32903178
MESON_PCLK(_name, _reg, _bit, &s4_sys_clk.hw)
32913179

0 commit comments

Comments
 (0)